aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/semaphore1.c
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/semaphore1.c
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/semaphore1.c')
-rw-r--r--pthreads/tests/semaphore1.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/pthreads/tests/semaphore1.c b/pthreads/tests/semaphore1.c
index 8fc91ee02..938f0b59e 100644
--- a/pthreads/tests/semaphore1.c
+++ b/pthreads/tests/semaphore1.c
@@ -6,10 +6,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,7 +86,12 @@ thr(void * arg)
if ( result == -1 )
{
- int err = errno;
+ int err =
+#if defined(PTW32_USES_SEPARATE_CRT)
+ GetLastError();
+#else
+ errno;
+#endif
if (err != EAGAIN)
{
printf("thread: sem_trywait 1: expecting error %s: got %s\n",
@@ -126,7 +132,12 @@ main()
if (result2 == -1)
{
- int err = errno;
+ int err =
+#if defined(PTW32_USES_SEPARATE_CRT)
+ GetLastError();
+#else
+ errno;
+#endif
if (err != EAGAIN)
{
printf("main: sem_trywait 1: expecting error %s: got %s\n",