aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/test.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
committermarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
commit8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch)
tree158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/tests/test.h
parent4a165ef2f762a4ce9155f2a3626692326bda616d (diff)
parentb41f74438672dd682bc01ae818cb3da654f22c1e (diff)
downloadvcxsrv-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/tests/test.h')
-rw-r--r--pthreads/tests/test.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/pthreads/tests/test.h b/pthreads/tests/test.h
index 042e87b68..4b3cf591c 100644
--- a/pthreads/tests/test.h
+++ b/pthreads/tests/test.h
@@ -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
@@ -44,6 +45,7 @@
#include <windows.h>
#include <stdio.h>
+#include <sys/timeb.h>
#define PTW32_THREAD_NULL_ID {NULL,0}
@@ -53,19 +55,19 @@
#define rand_r( _seed ) \
( _seed == _seed? rand() : rand() )
-#if defined(__MINGW32__)
-#include <stdint.h>
+#if defined(PTW32_CONFIG_MINGW)
+# include <stdint.h>
#elif defined(__BORLANDC__)
-#define int64_t ULONGLONG
+# define int64_t ULONGLONG
#else
-#define int64_t _int64
+# define int64_t _int64
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1400
# define PTW32_FTIME(x) _ftime64_s(x)
# define PTW32_STRUCT_TIMEB struct __timeb64
#elif ( defined(_MSC_VER) && _MSC_VER >= 1300 ) || \
- ( defined(__MINGW32__) && __MSVCRT_VERSION__ >= 0x0601 )
+ ( defined(PTW32_CONFIG_MINGW) && __MSVCRT_VERSION__ >= 0x0601 )
# define PTW32_FTIME(x) _ftime64(x)
# define PTW32_STRUCT_TIMEB struct __timeb64
#else