Index: trunk/archive/pslib/include/psMemory.h
===================================================================
--- trunk/archive/pslib/include/psMemory.h	(revision 396)
+++ trunk/archive/pslib/include/psMemory.h	(revision 753)
@@ -26,14 +26,14 @@
 
 /// prototype of a basic callback used by memory functions 
-typedef long (*psMemAllocateCB)(const psMemBlock *ptr);
+typedef long (*psMemAllocateCallback)(const psMemBlock *ptr);
 
 /// prototype of memory free callback used by memory functions 
-typedef long (*psMemFreeCB)(const psMemBlock *ptr);
+typedef long (*psMemFreeCallback)(const psMemBlock *ptr);
 
 /// prototype of a callback used in error conditions 
-typedef void (*psMemProblemCB)(const psMemBlock *ptr, const char *file, int lineno);
+typedef void (*psMemProblemCallback)(const psMemBlock *ptr, const char *file, int lineno);
 
 /// prototype of a callback used when memory runs out 
-typedef void *(*psMemExhaustedCB)(size_t size);
+typedef void *(*psMemExhaustedCallback)(size_t size);
 
 /** Functions **************************************************************/
@@ -84,17 +84,17 @@
 
 /// Set callback for problems 
-psMemProblemCB psMemProblemCBSet(psMemProblemCB func) ///< Function to run
+psMemProblemCallback psMemProblemCallbackSet(psMemProblemCallback func) ///< Function to run
 ;
 
 /// Set callback for out-of-memory 
-psMemExhaustedCB psMemExhaustedCBSet(psMemExhaustedCB func) ///< Function to run
+psMemExhaustedCallback psMemExhaustedCallbackSet(psMemExhaustedCallback func) ///< Function to run
 ;
 
 /// Set call back for when a particular memory block is allocated 
-psMemAllocateCB psMemAllocateCBSet(psMemAllocateCB func) ///< Function to run
+psMemAllocateCallback psMemAllocateCallbackSet(psMemAllocateCallback func) ///< Function to run
 ;
 
 /// Set call back for when a particular memory block is freed 
-psMemFreeCB psMemFreeCBSet(psMemFreeCB func) ///< Function to run
+psMemFreeCallback psMemFreeCallbackSet(psMemFreeCallback func) ///< Function to run
 ;