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/ptw32_relmillisecs.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/ptw32_relmillisecs.c')
| -rw-r--r-- | pthreads/ptw32_relmillisecs.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pthreads/ptw32_relmillisecs.c b/pthreads/ptw32_relmillisecs.c index 894d5c9d4..34a855c10 100644 --- a/pthreads/ptw32_relmillisecs.c +++ b/pthreads/ptw32_relmillisecs.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,6 +35,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" #if !defined(NEED_FTIME) @@ -57,8 +62,8 @@ ptw32_relmillisecs (const struct timespec * abstime) FILETIME ft; SYSTEMTIME st; #else /* ! NEED_FTIME */ -#if ( defined(_MSC_VER) && _MSC_VER >= 1300 ) || \ - ( (defined(__MINGW64__) || defined(__MINGW32__)) && __MSVCRT_VERSION__ >= 0x0601 ) +#if ( defined(_MSC_VER) && _MSC_VER >= 1300 ) /* MSVC7+ */ || \ + ( defined(PTW32_CONFIG_MINGW) && __MSVCRT_VERSION__ >= 0x0601 ) struct __timeb64 currSysTime; #else struct _timeb currSysTime; @@ -99,10 +104,10 @@ ptw32_relmillisecs (const struct timespec * abstime) #else /* ! NEED_FTIME */ -#if defined(_MSC_VER) && _MSC_VER >= 1400 +#if defined(_MSC_VER) && _MSC_VER >= 1400 /* MSVC8+ */ _ftime64_s(&currSysTime); -#elif ( defined(_MSC_VER) && _MSC_VER >= 1300 ) || \ - ( (defined(__MINGW64__) || defined(__MINGW32__)) && __MSVCRT_VERSION__ >= 0x0601 ) +#elif ( defined(_MSC_VER) && _MSC_VER >= 1300 ) /* MSVC7+ */ || \ + ( defined(PTW32_CONFIG_MINGW) && __MSVCRT_VERSION__ >= 0x0601 ) _ftime64(&currSysTime); #else _ftime(&currSysTime); |