X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5dcf05ae082a2da39102dec13ab3ad4c483221c8..9390a202a8b9d67d393faf3e1323885e6a27c127:/include/wx/memory.h diff --git a/include/wx/memory.h b/include/wx/memory.h index 8f4d7a1270..841ea9e410 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -17,6 +17,7 @@ #endif #include "wx/defs.h" +#include "wx/string.h" /* The macro which will be expanded to include the file and line number @@ -37,8 +38,6 @@ # endif #endif -#include "wx/string.h" - #ifdef __WXDEBUG__ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE); @@ -83,7 +82,9 @@ void operator delete[](void *buf, char*, int); #endif #endif + // wxUSE_GLOBAL_MEMORY_OPERATORS #endif + // __WXDEBUG__ typedef unsigned int wxMarkerType;