From a1bc1b5e718250c3ca18736f80c0e6d4ff3f092e Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Mon, 8 Sep 2003 18:54:05 +0000 Subject: Bugzilla bug 217968: renamed the STACKSIZE macro to THREAD_STACKSIZE to avoid a conflict with a same-named macro defined in on Mac OS X. Thanks to timeless@bemail.org for reporting the bug. Modified Files: server_test.c servr_kk.c servr_ku.c servr_uk.c servr_uu.c --- pr/tests/server_test.c | 10 +++++----- pr/tests/servr_kk.c | 10 +++++----- pr/tests/servr_ku.c | 10 +++++----- pr/tests/servr_uk.c | 10 +++++----- pr/tests/servr_uu.c | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pr/tests/server_test.c b/pr/tests/server_test.c index 46c474b3..572fea46 100644 --- a/pr/tests/server_test.c +++ b/pr/tests/server_test.c @@ -61,7 +61,7 @@ #include #define PORT 15004 -#define STACKSIZE 0 +#define THREAD_STACKSIZE 0 #define PASS 0 #define FAIL 1 @@ -225,7 +225,7 @@ WorkerThreadFunc(void *_listenSock) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) if (debug_mode) printf("Error creating client thread %d\n", workerThreads); @@ -314,7 +314,7 @@ ServerSetup(void) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) { if (debug_mode) printf("error creating working thread\n"); @@ -469,7 +469,7 @@ RunClients(void) PR_PRIORITY_NORMAL, ClientScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!clientThread) { if (debug_mode) printf("\terror creating client thread %d\n", index); @@ -500,7 +500,7 @@ void do_work() PR_PRIORITY_NORMAL, ServerScope, PR_JOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!ServerThread) { if (debug_mode) printf("error creating main server thread\n"); return; diff --git a/pr/tests/servr_kk.c b/pr/tests/servr_kk.c index d9423343..1a477f9a 100644 --- a/pr/tests/servr_kk.c +++ b/pr/tests/servr_kk.c @@ -63,7 +63,7 @@ #include #define PORT 15004 -#define STACKSIZE 0 +#define THREAD_STACKSIZE 0 static int _iterations = 1000; static int _clients = 1; @@ -191,7 +191,7 @@ WorkerThreadFunc(void *_listenSock) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) if (debug_mode) printf("Error creating client thread %d\n", workerThreads); @@ -291,7 +291,7 @@ ServerSetup(void) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) { if (debug_mode) printf("error creating working thread\n"); @@ -446,7 +446,7 @@ RunClients(void) PR_PRIORITY_NORMAL, ClientScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!clientThread) { if (debug_mode) printf("\terror creating client thread %d\n", index); @@ -477,7 +477,7 @@ void do_work() PR_PRIORITY_NORMAL, ServerScope, PR_JOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!ServerThread) { if (debug_mode) printf("error creating main server thread\n"); return; diff --git a/pr/tests/servr_ku.c b/pr/tests/servr_ku.c index d785e201..25808516 100644 --- a/pr/tests/servr_ku.c +++ b/pr/tests/servr_ku.c @@ -63,7 +63,7 @@ #include #define PORT 15004 -#define STACKSIZE 0 +#define THREAD_STACKSIZE 0 static int _iterations = 1000; static int _clients = 1; @@ -192,7 +192,7 @@ WorkerThreadFunc(void *_listenSock) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) if (debug_mode) printf("Error creating client thread %d\n", workerThreads); @@ -292,7 +292,7 @@ ServerSetup(void) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) { if (debug_mode) printf("error creating working thread\n"); @@ -447,7 +447,7 @@ RunClients(void) PR_PRIORITY_NORMAL, ClientScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!clientThread) { if (debug_mode) printf("\terror creating client thread %d\n", index); @@ -478,7 +478,7 @@ void do_work() PR_PRIORITY_NORMAL, ServerScope, PR_JOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!ServerThread) { if (debug_mode) printf("error creating main server thread\n"); return; diff --git a/pr/tests/servr_uk.c b/pr/tests/servr_uk.c index 685c76a1..eb7d48fb 100644 --- a/pr/tests/servr_uk.c +++ b/pr/tests/servr_uk.c @@ -63,7 +63,7 @@ #include #define PORT 15004 -#define STACKSIZE 0 +#define THREAD_STACKSIZE 0 static int _iterations = 1000; static int _clients = 1; @@ -194,7 +194,7 @@ WorkerThreadFunc(void *_listenSock) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) if (debug_mode) printf("Error creating client thread %d\n", workerThreads); @@ -294,7 +294,7 @@ ServerSetup(void) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) { if (debug_mode) printf("error creating working thread\n"); @@ -449,7 +449,7 @@ RunClients(void) PR_PRIORITY_NORMAL, ClientScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!clientThread) { if (debug_mode) printf("\terror creating client thread %d\n", index); @@ -480,7 +480,7 @@ void do_work() PR_PRIORITY_NORMAL, ServerScope, PR_JOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!ServerThread) { if (debug_mode) printf("error creating main server thread\n"); return; diff --git a/pr/tests/servr_uu.c b/pr/tests/servr_uu.c index 4722494b..1c6f2e8f 100644 --- a/pr/tests/servr_uu.c +++ b/pr/tests/servr_uu.c @@ -63,7 +63,7 @@ #include #define PORT 15004 -#define STACKSIZE 0 +#define THREAD_STACKSIZE 0 static int _iterations = 1000; static int _clients = 1; @@ -192,7 +192,7 @@ WorkerThreadFunc(void *_listenSock) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) if (debug_mode) printf("Error creating client thread %d\n", workerThreads); @@ -292,7 +292,7 @@ ServerSetup(void) PR_PRIORITY_NORMAL, ServerScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!WorkerThread) { if (debug_mode) printf("error creating working thread\n"); @@ -447,7 +447,7 @@ RunClients(void) PR_PRIORITY_NORMAL, ClientScope, PR_UNJOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!clientThread) { if (debug_mode) printf("\terror creating client thread %d\n", index); @@ -478,7 +478,7 @@ void do_work() PR_PRIORITY_NORMAL, ServerScope, PR_JOINABLE_THREAD, - STACKSIZE); + THREAD_STACKSIZE); if (!ServerThread) { if (debug_mode) printf("error creating main server thread\n"); return; -- cgit v1.2.1