Merge remote-tracking branch 'origin/released'

* origin/released:
  Updated to latest CVS version of pthreads

Conflicts:
	pthreads/Makefile

1 files changed, 28 insertions, 23 deletions

diff --git a/pthreads/semaphore.h b/pthreads/semaphore.h
index c6e9407e2..835677b40 100644
--- a/pthreads/semaphore.h
+++ b/pthreads/semaphore.h
@@ -11,10 +11,11 @@
  *
  *      Pthreads-win32 - POSIX Threads Library for Win32
  *      Copyright(C) 1998 John E. Bossom
- *      Copyright(C) 1999,2005 Pthreads-win32 contributors
- * 
- *      Contact Email: rpj@callisto.canberra.edu.au
- * 
+ *      Copyright(C) 1999,2012 Pthreads-win32 contributors
+ *
+ *      Homepage1: http://sourceware.org/pthreads-win32/
+ *      Homepage2: http://sourceforge.net/projects/pthreads4w/
+ *
  *      The current list of contributors is contained
  *      in the file CONTRIBUTORS included with the source
  *      code distribution. The list can also be seen at the
@@ -85,6 +86,10 @@
 #  define PTW32_DLLPORT
 #endif
 
+#if !defined(PTW32_CDECL)
+# define PTW32_CDECL __cdecl
+#endif
+
 /*
  * This is a duplicate of what is in the autoconf config.h,
  * which is only used when building the pthread-win32 libraries.
@@ -129,35 +134,35 @@ typedef unsigned int mode_t;
 
 typedef struct sem_t_ * sem_t;
 
-PTW32_DLLPORT int __cdecl sem_init (sem_t * sem,
-			    int pshared,
-			    unsigned int value);
+PTW32_DLLPORT int PTW32_CDECL sem_init (sem_t * sem,
+					int pshared,
+					unsigned int value);
 
-PTW32_DLLPORT int __cdecl sem_destroy (sem_t * sem);
+PTW32_DLLPORT int PTW32_CDECL sem_destroy (sem_t * sem);
 
-PTW32_DLLPORT int __cdecl sem_trywait (sem_t * sem);
+PTW32_DLLPORT int PTW32_CDECL sem_trywait (sem_t * sem);
 
-PTW32_DLLPORT int __cdecl sem_wait (sem_t * sem);
+PTW32_DLLPORT int PTW32_CDECL sem_wait (sem_t * sem);
 
-PTW32_DLLPORT int __cdecl sem_timedwait (sem_t * sem,
-				 const struct timespec * abstime);
+PTW32_DLLPORT int PTW32_CDECL sem_timedwait (sem_t * sem,
+					     const struct timespec * abstime);
 
-PTW32_DLLPORT int __cdecl sem_post (sem_t * sem);
+PTW32_DLLPORT int PTW32_CDECL sem_post (sem_t * sem);
 
-PTW32_DLLPORT int __cdecl sem_post_multiple (sem_t * sem,
-				     int count);
+PTW32_DLLPORT int PTW32_CDECL sem_post_multiple (sem_t * sem,
+						 int count);
 
-PTW32_DLLPORT int __cdecl sem_open (const char * name,
-			    int oflag,
-			    mode_t mode,
-			    unsigned int value);
+PTW32_DLLPORT int PTW32_CDECL sem_open (const char * name,
+					int oflag,
+					mode_t mode,
+					unsigned int value);
 
-PTW32_DLLPORT int __cdecl sem_close (sem_t * sem);
+PTW32_DLLPORT int PTW32_CDECL sem_close (sem_t * sem);
 
-PTW32_DLLPORT int __cdecl sem_unlink (const char * name);
+PTW32_DLLPORT int PTW32_CDECL sem_unlink (const char * name);
 
-PTW32_DLLPORT int __cdecl sem_getvalue (sem_t * sem,
-				int * sval);
+PTW32_DLLPORT int PTW32_CDECL sem_getvalue (sem_t * sem,
+					    int * sval);
 
 #if defined(__cplusplus)
 }				/* End of extern "C" */