maint: update copyright

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

diff --git a/lib/glthread/yield.h b/lib/glthread/yield.h
index 80cfb88..f65571f 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-2014 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
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 /* This file contains a primitive for yielding the processor to other threads.
      extern void gl_thread_yield (void);
@@ -39,6 +38,10 @@ extern "C" {
 # define gl_thread_yield() \
     sched_yield ()
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif
 
 /* ========================================================================= */
@@ -56,6 +59,10 @@ extern "C" {
 # define gl_thread_yield() \
     pth_yield (NULL)
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif
 
 /* ========================================================================= */
@@ -65,7 +72,6 @@ extern "C" {
 /* Use the old Solaris threads library.  */
 
 # include <thread.h>
-# include <synch.h>
 
 # ifdef __cplusplus
 extern "C" {
@@ -74,11 +80,18 @@ extern "C" {
 # define gl_thread_yield() \
     thr_yield ()
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif
 
 /* ========================================================================= */
 
-#if USE_WIN32_THREADS
+#if USE_WINDOWS_THREADS
+
+# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+# include <windows.h>
 
 # ifdef __cplusplus
 extern "C" {
@@ -87,11 +100,15 @@ extern "C" {
 # define gl_thread_yield() \
     Sleep (0)
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */