git-merge-changelog: add doc relating to use with bzr and hg.

[gnulib.git] / lib / glthread / yield.h

diff --git a/lib/glthread/yield.h b/lib/glthread/yield.h
index 80cfb88..b2f44ac 100644 (file)
--- a/lib/glthread/yield.h
+++ b/lib/glthread/yield.h
@@ -1,5 +1,5 @@
 /* Yielding the processor to other threads and processes.
-   Copyright (C) 2005-2008 Free Software Foundation, Inc.
+   Copyright (C) 2005-2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -39,6 +39,10 @@ extern "C" {
 # define gl_thread_yield() \
     sched_yield ()
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif
 
 /* ========================================================================= */
@@ -56,6 +60,10 @@ extern "C" {
 # define gl_thread_yield() \
     pth_yield (NULL)
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif
 
 /* ========================================================================= */
@@ -65,7 +73,6 @@ extern "C" {
 /* Use the old Solaris threads library.  */
 
 # include <thread.h>
-# include <synch.h>
 
 # ifdef __cplusplus
 extern "C" {
@@ -74,12 +81,18 @@ extern "C" {
 # define gl_thread_yield() \
     thr_yield ()
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif
 
 /* ========================================================================= */
 
 #if USE_WIN32_THREADS
 
+# include <windows.h>
+
 # ifdef __cplusplus
 extern "C" {
 # endif
@@ -87,6 +100,10 @@ extern "C" {
 # define gl_thread_yield() \
     Sleep (0)
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif
 
 /* ========================================================================= */