Merge branch 'master' of github.com:D-Programming-Language/druntime

changelog.dd

@@ -2,6 +2,9 @@ $(VERSION 054, mmm dd, 2011, =================================================,
 
     $(WHATSNEW
 $(LI Added core.sys.posix.netdb)
+$(LI For functions which have a version which takes a core.time.Duration
+     and another version which takes an integral value, the version which
+     takes an integral value is now scheduled for deprecation.)
     )
     $(RUNTIMEBUGSFIXED
 $(LI $(BUGZILLA 4323): std.demangle incorrectly handles template floating point numbers)

src/core/sync/condition.d

@@ -190,6 +190,9 @@ class Condition
 
 
     /**
+     * $(RED Scheduled for deprecation in January 2012. Please use the version
+     *       which takes a $(D Duration) instead.)
+     *
      * Suspends the calling thread until a notification occurs or until the
      * supplied time period has elapsed.
      *

src/core/sync/semaphore.d

@@ -259,6 +259,9 @@ class Semaphore
 
 
     /**
+     * $(RED Scheduled for deprecation in January 2012. Please use the version
+     *       which takes a $(D Duration) instead.)
+     *
      * Suspends the calling thread until the current count moves above zero or
      * until the supplied time period has elapsed.  If the count moves above
      * zero in this interval, then atomically decrement the count by one and

src/core/sys/posix/sys/socket.d

@@ -377,6 +377,7 @@ else version( OSX )
         SO_ERROR        = 0x1007,
         SO_KEEPALIVE    = 0x0008,
         SO_LINGER       = 0x1080,
+        SO_NOSIGPIPE    = 0x1022, // non-standard
         SO_OOBINLINE    = 0x0100,
         SO_RCVBUF       = 0x1002,
         SO_RCVLOWAT     = 0x1004,
@@ -548,6 +549,7 @@ else version( FreeBSD )
         SO_ERROR        = 0x1007,
         SO_KEEPALIVE    = 0x0008,
         SO_LINGER       = 0x0080,
+        SO_NOSIGPIPE    = 0x0800, // non-standard
         SO_OOBINLINE    = 0x0100,
         SO_RCVBUF       = 0x1002,
         SO_RCVLOWAT     = 0x1004,

src/core/thread.d

@@ -188,7 +188,7 @@ version( Windows )
                     last.next = t;
                 }
             }
-            
+
             version( D_InlineAsm_X86 )
             {
                 asm { fninit; }
@@ -793,7 +793,7 @@ class Thread
         //       starting thread.  In effect, not doing the add here risks
         //       having thread being treated like a daemon thread.
         synchronized( slock )
-        {	    
+        {
             version( Windows )
             {
                 m_hndl = cast(HANDLE) _beginthreadex( null, m_sz, &thread_entryPoint, cast(void*) this, 0, &m_addr );
@@ -1066,6 +1066,9 @@ class Thread
 
 
     /**
+     * $(RED Scheduled for deprecation in January 2012. Please use the version
+     *       which takes a $(D Duration) instead.)
+     *
      * Suspends the calling thread for at least the supplied period.  This may
      * result in multiple OS calls if period is greater than the maximum sleep
      * duration supported by the operating system.

src/gc/gc.d

@@ -152,7 +152,10 @@ extern (C) void gc_disable()
 extern (C) void gc_collect()
 {
     if( proxy is null )
-        return _gc.fullCollect();
+    {
+        _gc.fullCollect();
+        return;
+    }
     return proxy.gc_collect();
 }