Index: trunk/archive/pslib/include/psMemory.h
===================================================================
--- trunk/archive/pslib/include/psMemory.h	(revision 257)
+++ trunk/archive/pslib/include/psMemory.h	(revision 260)
@@ -117,12 +117,13 @@
 #define psFree(size) p_psFree(size, __FILE__, __LINE__)
 
-/// prevent the use of 'malloc'. malloc is re-defined to throw an error in the C preprocessor 
-#define malloc(S) for
-
-/// prevent the use of 'realloc'. realloc is re-defined to throw an error in the C preprocessor 
-#define realloc(P,S) for
-
-/// prevent the use of 'free'. free is re-defined to throw an error in the C preprocessor 
-#define free(P) for
+/*
+ * Ensure that any program using malloc/realloc/free will fail to compile
+ */
+#if !defined(PS_ALLOW_MALLOC)
+#  define malloc(S) for
+#  define realloc(P,S) for
+#  define calloc(S) for
+#  define free(P) for
+#endif
 
 #endif