This is the mail archive of the
pthreads-win32@sources.redhat.com
mailing list for the pthreas-win32 project.
Intel C++ 8.1 fix for pthread-win32 test code
- From: Dongsheng Song <dongsheng dot song at gmail dot com>
- To: pthreads-win32 at sources dot redhat dot com
- Date: Thu, 03 Mar 2005 11:18:52 +0800
- Subject: Intel C++ 8.1 fix for pthread-win32 test code
- References: <42267EA1.5050300@gmail.com>
D:\tmp\pthreads-win32\tests>cvs diff
cvs diff: Diffing .
Index: exit2.c
===================================================================
RCS file: /cvs/pthreads-win32/pthreads/tests/exit2.c,v
retrieving revision 1.11
diff -r1.11 exit2.c
49a50,51
>
> return NULL;
Index: exit3.c
===================================================================
RCS file: /cvs/pthreads-win32/pthreads/tests/exit3.c,v
retrieving revision 1.8
diff -r1.8 exit3.c
47a48,49
>
> return NULL;
Index: eyal1.c
===================================================================
RCS file: /cvs/pthreads-win32/pthreads/tests/eyal1.c,v
retrieving revision 1.17
diff -r1.17 eyal1.c
137c137
< s += 2 * f * g / (h != 0 ? (h * h) : 1);
---
> s += 2 * f * g / ((int) h != 0 ? (h * h) : 1);
Index: mutex5.c
===================================================================
RCS file: /cvs/pthreads-win32/pthreads/tests/mutex5.c,v
retrieving revision 1.8
diff -r1.8 mutex5.c
50,53c50,53
< assert(success = PTHREAD_MUTEX_DEFAULT == PTHREAD_MUTEX_NORMAL);
< assert(success = PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_ERRORCHECK);
< assert(success = PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_RECURSIVE);
< assert(success = PTHREAD_MUTEX_RECURSIVE != PTHREAD_MUTEX_ERRORCHECK);
---
> assert(PTHREAD_MUTEX_DEFAULT == PTHREAD_MUTEX_NORMAL);
> assert(PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_ERRORCHECK);
> assert(PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_RECURSIVE);
> assert(PTHREAD_MUTEX_RECURSIVE != PTHREAD_MUTEX_ERRORCHECK);
55,57c55,57
< assert(success = PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_FAST_NP);
< assert(success = PTHREAD_MUTEX_RECURSIVE == PTHREAD_MUTEX_RECURSIVE_NP);
< assert(success = PTHREAD_MUTEX_ERRORCHECK ==
PTHREAD_MUTEX_ERRORCHECK_NP);
---
> assert(PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_FAST_NP);
> assert(PTHREAD_MUTEX_RECURSIVE == PTHREAD_MUTEX_RECURSIVE_NP);
> assert(PTHREAD_MUTEX_ERRORCHECK == PTHREAD_MUTEX_ERRORCHECK_NP);
Index: exit2.c
===================================================================
RCS file: /cvs/pthreads-win32/pthreads/tests/exit2.c,v
retrieving revision 1.11
diff -r1.11 exit2.c
49a50,51
>
> return NULL;
Index: exit3.c
===================================================================
RCS file: /cvs/pthreads-win32/pthreads/tests/exit3.c,v
retrieving revision 1.8
diff -r1.8 exit3.c
47a48,49
>
> return NULL;
Index: eyal1.c
===================================================================
RCS file: /cvs/pthreads-win32/pthreads/tests/eyal1.c,v
retrieving revision 1.17
diff -r1.17 eyal1.c
137c137
< s += 2 * f * g / (h != 0 ? (h * h) : 1);
---
> s += 2 * f * g / ((int) h != 0 ? (h * h) : 1);
Index: mutex5.c
===================================================================
RCS file: /cvs/pthreads-win32/pthreads/tests/mutex5.c,v
retrieving revision 1.8
diff -r1.8 mutex5.c
50,53c50,53
< assert(success = PTHREAD_MUTEX_DEFAULT == PTHREAD_MUTEX_NORMAL);
< assert(success = PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_ERRORCHECK);
< assert(success = PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_RECURSIVE);
< assert(success = PTHREAD_MUTEX_RECURSIVE != PTHREAD_MUTEX_ERRORCHECK);
---
> assert(PTHREAD_MUTEX_DEFAULT == PTHREAD_MUTEX_NORMAL);
> assert(PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_ERRORCHECK);
> assert(PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_RECURSIVE);
> assert(PTHREAD_MUTEX_RECURSIVE != PTHREAD_MUTEX_ERRORCHECK);
55,57c55,57
< assert(success = PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_FAST_NP);
< assert(success = PTHREAD_MUTEX_RECURSIVE == PTHREAD_MUTEX_RECURSIVE_NP);
< assert(success = PTHREAD_MUTEX_ERRORCHECK == PTHREAD_MUTEX_ERRORCHECK_NP);
---
> assert(PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_FAST_NP);
> assert(PTHREAD_MUTEX_RECURSIVE == PTHREAD_MUTEX_RECURSIVE_NP);
> assert(PTHREAD_MUTEX_ERRORCHECK == PTHREAD_MUTEX_ERRORCHECK_NP);