minor change
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 20 Jul 2011 19:55:48 +0000 (14:55 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 20 Jul 2011 19:55:48 +0000 (14:55 -0500)
src/arch/shmem/machine.c

index a00c91b2ae872f307986de6cd3814d042098b615..4c89ee3c5428601f6a313a04ed6f831fbb6db2e0 100644 (file)
@@ -575,7 +575,7 @@ void ConverseExit()
   }
 #endif
   ConverseCommonExit();
-#if CMK_CRAYXT | CMK_CRAYXE
+#if CMK_CRAYXT || CMK_CRAYXE
   shmem_finalize();
 #endif
   exit(0);
@@ -633,7 +633,7 @@ static void McInit()
 {
   CMK_SHMEM_INIT;
 
-#if CMK_CRAYXT | CMK_CRAYXE
+#if CMK_CRAYXT || CMK_CRAYXE
   _Cmi_mype = shmem_my_pe();
   _Cmi_numpes = shmem_n_pes();
 #else
@@ -1064,7 +1064,7 @@ void arena_init()
   size_t maxmem = 0;
   int nslots;
   char *s;
-#if CMK_CRAYXT | CMK_CRAYXE
+#if CMK_CRAYXT || CMK_CRAYXE
   if (s = getenv("XT_SYMMETRIC_HEAP_SIZE")) {
     size_t n=0;
     switch (s[strlen(s)-1]) {