diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 10:41:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 10:41:10 +0100 |
| commit | b41f74438672dd682bc01ae818cb3da654f22c1e (patch) | |
| tree | 07674ef1368a5427a75080528d8cee74234f6b28 /pthreads/ptw32_throw.c | |
| parent | aaf21968deb85b635cb6aa6544df233ea5981346 (diff) | |
| download | vcxsrv-b41f74438672dd682bc01ae818cb3da654f22c1e.tar.gz vcxsrv-b41f74438672dd682bc01ae818cb3da654f22c1e.tar.bz2 vcxsrv-b41f74438672dd682bc01ae818cb3da654f22c1e.zip | |
Updated to latest CVS version of pthreads
Diffstat (limited to 'pthreads/ptw32_throw.c')
| -rw-r--r-- | pthreads/ptw32_throw.c | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/pthreads/ptw32_throw.c b/pthreads/ptw32_throw.c index 1404e940f..f96ffd487 100644 --- a/pthreads/ptw32_throw.c +++ b/pthreads/ptw32_throw.c @@ -9,10 +9,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 @@ -35,6 +36,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "pthread.h" #include "implement.h" @@ -90,21 +95,21 @@ ptw32_throw (DWORD exception) * explicit thread exit here after cleaning up POSIX * residue (i.e. cleanup handlers, POSIX thread handle etc). */ -#if ! (defined(__MINGW64__) || defined(__MINGW32__)) || defined (__MSVCRT__) || defined (__DMC__) +#if ! defined (PTW32_CONFIG_MINGW) || defined (__MSVCRT__) || defined (__DMC__) unsigned exitCode = 0; switch (exception) - { - case PTW32_EPS_CANCEL: - exitCode = (unsigned)(size_t) PTHREAD_CANCELED; - break; - case PTW32_EPS_EXIT: - if (NULL != sp) - { - exitCode = (unsigned)(size_t) sp->exitStatus; - } - break; - } + { + case PTW32_EPS_CANCEL: + exitCode = (unsigned)(size_t) PTHREAD_CANCELED; + break; + case PTW32_EPS_EXIT: + if (NULL != sp) + { + exitCode = (unsigned)(size_t) sp->exitStatus; + } + break; + } #endif #if defined(PTW32_STATIC_LIB) @@ -113,7 +118,7 @@ ptw32_throw (DWORD exception) #endif -#if ! (defined(__MINGW64__) || defined(__MINGW32__)) || defined (__MSVCRT__) || defined (__DMC__) +#if ! defined (PTW32_CONFIG_MINGW) || defined (__MSVCRT__) || defined (__DMC__) _endthreadex (exitCode); #else _endthread (); @@ -128,7 +133,7 @@ ptw32_throw (DWORD exception) exceptionInformation[1] = (DWORD) (0); exceptionInformation[2] = (DWORD) (0); - RaiseException (EXCEPTION_PTW32_SERVICES, 0, 3, exceptionInformation); + RaiseException (EXCEPTION_PTW32_SERVICES, 0, 3, (ULONG_PTR *) exceptionInformation); #else /* __CLEANUP_SEH */ |