зеркало из https://github.com/mozilla/pjs.git
#undef CreateDirectory to fix problem where winbase.h #define
CreateDirectory and makes it appear as if nsFileSpec has a CreateDirectory[A|W] method.
This commit is contained in:
Родитель
2b0680367c
Коммит
9399054cb4
|
@ -113,6 +113,7 @@
|
|||
#include "nsString.h"
|
||||
#include "nsCRT.h"
|
||||
#include "prtypes.h"
|
||||
|
||||
//========================================================================================
|
||||
// Compiler-specific macros, as needed
|
||||
//========================================================================================
|
||||
|
@ -141,6 +142,16 @@
|
|||
#elif defined(XP_UNIX) || defined (XP_OS2) || defined(XP_BEOS)
|
||||
#include <dirent.h>
|
||||
#elif defined(XP_PC)
|
||||
|
||||
// This clashes with some of the Win32 system headers (specifically,
|
||||
// winbase.h). Hopefully they'll have been included first; else we may
|
||||
// have problems. We could include winbase.h before doing this;
|
||||
// unfortunately, it's bring in too much crap and'd slow stuff down
|
||||
// more than it's worth doing.
|
||||
#ifdef CreateDirectory
|
||||
#undef CreateDirectory
|
||||
#endif
|
||||
|
||||
#include "prio.h"
|
||||
#endif
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче