[mpich2-commits] r5597 - mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-10-28 12:59:14 -0500 (Wed, 28 Oct 2009)
New Revision: 5597

Modified:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_datatypes.h
Log:
There was an error in r5554 that didn't actually fix ticket #906. This
commit should fix that error.


Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_datatypes.h
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_datatypes.h	2009-10-28 16:15:26 UTC (rev 5596)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_datatypes.h	2009-10-28 17:59:14 UTC (rev 5597)
@@ -185,7 +185,7 @@
 typedef struct MPID_nem_cell
 {
     MPID_nem_cell_rel_ptr_t next;
-#if MPID_NEM_CELL_HEAD_LEN != SIZEOF_OPA_PTR_T
+#if (MPID_NEM_CELL_HEAD_LEN > SIZEOF_OPA_PTR_T)
     char padding[MPID_NEM_CELL_HEAD_LEN - sizeof(MPID_nem_cell_rel_ptr_t)];
 #endif
     volatile MPID_nem_pkt_t pkt;
@@ -195,7 +195,7 @@
 typedef struct MPID_nem_abs_cell
 {
     struct MPID_nem_abs_cell *next;
-#if MPID_NEM_CELL_HEAD_LEN != SIZEOF_VOID_P
+#if (MPID_NEM_CELL_HEAD_LEN > SIZEOF_VOID_P)
     char padding[MPID_NEM_CELL_HEAD_LEN - sizeof(struct MPID_nem_abs_cell*)];
 #endif
     volatile MPID_nem_pkt_t pkt;
@@ -222,11 +222,11 @@
 {
     MPID_nem_cell_rel_ptr_t head;
     MPID_nem_cell_rel_ptr_t tail;
-#if MPID_NEM_CACHE_LINE_LEN != (2 * SIZEOF_OPA_PTR_T)
+#if (MPID_NEM_CACHE_LINE_LEN > (2 * SIZEOF_OPA_PTR_T))
     char padding1[MPID_NEM_CACHE_LINE_LEN - 2 * sizeof(MPID_nem_cell_rel_ptr_t)];
 #endif
     MPID_nem_cell_rel_ptr_t my_head;
-#if MPID_NEM_CACHE_LINE_LEN != SIZEOF_OPA_PTR_T
+#if (MPID_NEM_CACHE_LINE_LEN > SIZEOF_OPA_PTR_T)
     char padding2[MPID_NEM_CACHE_LINE_LEN - sizeof(MPID_nem_cell_rel_ptr_t)];
 #endif
 #if !defined(MPID_NEM_USE_LOCK_FREE_QUEUES)