Index: trunk/psLib/src/sys/psMemory.h
===================================================================
--- trunk/psLib/src/sys/psMemory.h	(revision 31152)
+++ trunk/psLib/src/sys/psMemory.h	(revision 31660)
@@ -73,5 +73,6 @@
 
     psReferenceCount refCounter;        ///< how many times pointer is referenced
-    bool persistent;                    ///< marks if this non-user persistent data like error stack, etc.
+    bool persistent;                    ///< true if this is non-user persistent data like error stack, etc.
+    bool inFlight;	                ///< true if a nearby block is being free'ed / realloc'ed (local lock)
     const uint32_t endblock;            ///< initialised to p_psMEMMAGIC
 }
@@ -145,4 +146,7 @@
 #endif // ifdef DOXYGEN
 
+// if we decide to use spinlocks for psMemory, it will be necessary to call this function at
+// the start of every psLib-based program (spinlocks do not have a static initializer)
+void psMemInit(void);
 
 /** Set the deallocator routine