forked from mirrors/gecko-dev
Bug 475027 - only MSVC needs jscpucfg.h... everyone else should be using jsautocfg.h and the configure-generated defines. If you're doing something crazy like cross-compiling from FreeBSD to Windows using MSVC, this will make your life happier r=crowder
This commit is contained in:
parent
b17991962a
commit
ada87e0952
1 changed files with 3 additions and 5 deletions
|
|
@ -273,12 +273,10 @@
|
||||||
#define JS_MIN(x,y) ((x)<(y)?(x):(y))
|
#define JS_MIN(x,y) ((x)<(y)?(x):(y))
|
||||||
#define JS_MAX(x,y) ((x)>(y)?(x):(y))
|
#define JS_MAX(x,y) ((x)>(y)?(x):(y))
|
||||||
|
|
||||||
#if (defined(XP_WIN) && !defined(CROSS_COMPILE)) || defined (WINCE)
|
#ifdef _MSC_VER
|
||||||
# include "jscpucfg.h" /* Use standard Mac or Windows configuration */
|
# include "jscpucfg.h" /* We can't auto-detect MSVC configuration */
|
||||||
#elif defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2) || defined(CROSS_COMPILE)
|
|
||||||
# include "jsautocfg.h" /* Use auto-detected configuration */
|
|
||||||
#else
|
#else
|
||||||
# error "Must define one of XP_BEOS, XP_OS2, XP_WIN or XP_UNIX"
|
# include "jsautocfg.h" /* Use auto-detected configuration */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
JS_BEGIN_EXTERN_C
|
JS_BEGIN_EXTERN_C
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue