1 files changed, 56 insertions, 64 deletions

diff --git a/nsprpub/pr/tests/affinity.c b/nsprpub/pr/tests/affinity.c
index 4bdbaf723..14d08efc1 100644
--- a/nsprpub/pr/tests/affinity.c
+++ b/nsprpub/pr/tests/affinity.c
@@ -11,82 +11,74 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef XP_BEOS
 
 /*
  * Test PR_GetThreadAffinityMask
- *		The function is called by each of local, global and global bound threads
- *		The test should be run on both single and multi-cpu systems
+ *      The function is called by each of local, global and global bound threads
+ *      The test should be run on both single and multi-cpu systems
  */
 static void PR_CALLBACK thread_start(void *arg)
 {
-PRUint32 mask = 0;
+    PRUint32 mask = 0;
 
-	if (PR_GetThreadAffinityMask(PR_GetCurrentThread(), &mask)) 
-		printf("\tthread_start: PR_GetCurrentThreadAffinityMask failed\n");
-	else
-		printf("\tthread_start: AffinityMask = 0x%x\n",mask);
+    if (PR_GetThreadAffinityMask(PR_GetCurrentThread(), &mask)) {
+        printf("\tthread_start: PR_GetCurrentThreadAffinityMask failed\n");
+    }
+    else {
+        printf("\tthread_start: AffinityMask = 0x%x\n",mask);
+    }
 
 }
 
 int main(int argc, char **argv)
 {
-	PRThread *t;
-
-	printf("main: creating local thread\n");
-
-	t = PR_CreateThread(PR_USER_THREAD,
-				  thread_start, 0, 
-				  PR_PRIORITY_NORMAL,
-				  PR_LOCAL_THREAD,
-				  PR_JOINABLE_THREAD,
-				  0);
-
-	if (NULL == t) {
-		printf("main: cannot create local thread\n");
-		exit(1);
-	}
-
-	PR_JoinThread(t);
-
-	printf("main: creating global thread\n");
-	t = PR_CreateThread(PR_USER_THREAD,
-				  thread_start, 0, 
-				  PR_PRIORITY_NORMAL,
-				  PR_GLOBAL_THREAD,
-				  PR_JOINABLE_THREAD,
-				  0);
-
-	if (NULL == t) {
-		printf("main: cannot create global thread\n");
-		exit(1);
-	}
-
-	PR_JoinThread(t);
-
-	printf("main: creating global bound thread\n");
-	t = PR_CreateThread(PR_USER_THREAD,
-				  thread_start, 0, 
-				  PR_PRIORITY_NORMAL,
-				  PR_GLOBAL_BOUND_THREAD,
-				  PR_JOINABLE_THREAD,
-				  0);
-
-	if (NULL == t) {
-		printf("main: cannot create global bound thread\n");
-		exit(1);
-	}
-
-	PR_JoinThread(t);
+    PRThread *t;
+
+    printf("main: creating local thread\n");
+
+    t = PR_CreateThread(PR_USER_THREAD,
+                        thread_start, 0,
+                        PR_PRIORITY_NORMAL,
+                        PR_LOCAL_THREAD,
+                        PR_JOINABLE_THREAD,
+                        0);
+
+    if (NULL == t) {
+        printf("main: cannot create local thread\n");
+        exit(1);
+    }
+
+    PR_JoinThread(t);
+
+    printf("main: creating global thread\n");
+    t = PR_CreateThread(PR_USER_THREAD,
+                        thread_start, 0,
+                        PR_PRIORITY_NORMAL,
+                        PR_GLOBAL_THREAD,
+                        PR_JOINABLE_THREAD,
+                        0);
+
+    if (NULL == t) {
+        printf("main: cannot create global thread\n");
+        exit(1);
+    }
+
+    PR_JoinThread(t);
+
+    printf("main: creating global bound thread\n");
+    t = PR_CreateThread(PR_USER_THREAD,
+                        thread_start, 0,
+                        PR_PRIORITY_NORMAL,
+                        PR_GLOBAL_BOUND_THREAD,
+                        PR_JOINABLE_THREAD,
+                        0);
+
+    if (NULL == t) {
+        printf("main: cannot create global bound thread\n");
+        exit(1);
+    }
+
+    PR_JoinThread(t);
 
     return 0;
 }
-
-#else /* !XP_BEOS */
-
-int main()
-{
-	printf( "This test is not supported on the BeOS\n" );
-	return 0;
-}
-#endif /* !XP_BEOS */