From: Dongsheng Song <dongsheng.song@gmail.com>
To: pthreads-win32@sources.redhat.com
Subject: Intel C++ 8.1 fix for pthread-win32 test code
Date: Thu, 03 Mar 2005 03:19:00 -0000 [thread overview]
Message-ID: <4226821C.7060603@gmail.com> (raw)
In-Reply-To: <42267EA1.5050300@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1972 bytes --]
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);
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1895 bytes --]
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);
next prev parent reply other threads:[~2005-03-03 3:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-03 3:04 VCE test failed under Microsoft Visual Studio .NET 2003 Dongsheng Song
2005-03-03 3:19 ` Dongsheng Song [this message]
2005-03-04 7:30 ` Ross Johnson
[not found] ` <4b3406f050304202047657da3@mail.gmail.com>
2005-03-08 12:08 ` Dongsheng Song
2005-03-08 13:33 ` Ross Johnson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4226821C.7060603@gmail.com \
--to=dongsheng.song@gmail.com \
--cc=pthreads-win32@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).