Changeset 11000

Timestamp:

Jan 9, 2007, 12:42:40 PM (19 years ago)

Author:

jhoblitt

Message:

resort PS_ASSERT_PTR now that config.h is consistently included

File:

• branches/jch-memory/psLib/src/sys/psAssert.h (modified) (1 diff)

branches/jch-memory/psLib/src/sys/psAssert.h

@@ -14 +14 @@
 { \
     if (NAME == NULL) return(RVAL); \
-}
-
-#if 0
-
-psMemBlock *mb = (psMemBlock*)(NAME) - 1;
-\
-if (mb->startblock != P_PS_MEMMAGIC || mb->endblock != P_PS_MEMMAGIC || \
-        *(psU32 *)((char *)(mb + 1) + mb->userMemorySize) != P_PS_MEMMAGIC)
-{
-    \
-    psError(PS_ERR_MEMORY_CORRUPTION, false, \
-            "Error: Pointer %s is corrupted or not on the PS memory system.", \
-            #NAME); \
-    return (RVAL); \
-} \
-}
-
-#endif
+    psMemBlock *mb = (psMemBlock*)(NAME) - 1; \
+    if (mb->startblock != P_PS_MEMMAGIC || mb->endblock != P_PS_MEMMAGIC || \
+            *(psU32 *)((char *)(mb + 1) + mb->userMemorySize) != P_PS_MEMMAGIC) { \
+        psError(PS_ERR_MEMORY_CORRUPTION, false, \
+                "Error: Pointer %s is corrupted or not on the PS memory system.", \
+                #NAME); \
+        return (RVAL); \
+    } \
+}
 
 #define PS_ASSERT_INT_UNEQUAL(NAME1, NAME2, RVAL) \