diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
| commit | 8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch) | |
| tree | 158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/pthread_once.c | |
| parent | 4a165ef2f762a4ce9155f2a3626692326bda616d (diff) | |
| parent | b41f74438672dd682bc01ae818cb3da654f22c1e (diff) | |
| download | vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.gz vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.bz2 vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated to latest CVS version of pthreads
Conflicts:
pthreads/Makefile
Diffstat (limited to 'pthreads/pthread_once.c')
| -rw-r--r-- | pthreads/pthread_once.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/pthreads/pthread_once.c b/pthreads/pthread_once.c index ef2c1f168..c80983726 100644 --- a/pthreads/pthread_once.c +++ b/pthreads/pthread_once.c @@ -8,10 +8,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 @@ -34,11 +35,15 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "pthread.h" #include "implement.h" int -pthread_once (pthread_once_t * once_control, void (*init_routine) (void)) +pthread_once (pthread_once_t * once_control, void (PTW32_CDECL *init_routine) (void)) { if (once_control == NULL || init_routine == NULL) { @@ -56,7 +61,7 @@ pthread_once (pthread_once_t * once_control, void (*init_routine) (void)) if (!once_control->done) { -#if defined(_MSC_VER) && _MSC_VER < 1400 +#if defined(PTW32_CONFIG_MSVC7) #pragma inline_depth(0) #endif @@ -64,14 +69,14 @@ pthread_once (pthread_once_t * once_control, void (*init_routine) (void)) (*init_routine)(); pthread_cleanup_pop(0); -#if defined(_MSC_VER) && _MSC_VER < 1400 +#if defined(PTW32_CONFIG_MSVC7) #pragma inline_depth() #endif once_control->done = PTW32_TRUE; } - ptw32_mcs_lock_release(&node); + ptw32_mcs_lock_release(&node); } return 0; |