kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-06 13:08:55 +00:00
Code Issues Projects Releases Wiki Activity

FS-2855 Fix spidermonkey under windows x64

Browse Source
This commit is contained in:
Jeff Lenk 2010-11-17 15:39:33 -06:00
parent 180f58a677
commit 4d41a0f3a2
3 changed files with 129 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
libs/js/src/jstypes.h
View File

@ -77,35 +77,25 @@
** **
***********************************************************************/ ***********************************************************************/
#ifdef WIN32 #ifdef WIN32
/* These also work for __MWERKS__ */ /* These also work for __MWERKS__ */
#define JS_EXTERN_API(__type) extern __declspec(dllexport) __type # define JS_EXTERN_API(__type) extern __declspec(dllexport) __type
#define JS_EXPORT_API(__type) __declspec(dllexport) __type # define JS_EXPORT_API(__type) __declspec(dllexport) __type
#define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type # define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
#define JS_EXPORT_DATA(__type) __declspec(dllexport) __type # define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
#define JS_DLL_CALLBACK # define JS_DLL_CALLBACK
#define JS_STATIC_DLL_CALLBACK(__x) static __x # define JS_STATIC_DLL_CALLBACK(__x) static __x
#elif defined(WIN16) #elif defined(XP_OS2) && defined(__declspec)
#ifdef _WINDLL # define JS_EXTERN_API(__type) extern __declspec(dllexport) __type
#define JS_EXTERN_API(__type) extern __type _cdecl _export _loadds # define JS_EXPORT_API(__type) __declspec(dllexport) __type
#define JS_EXPORT_API(__type) __type _cdecl _export _loadds # define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
#define JS_EXTERN_DATA(__type) extern __type _export # define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
#define JS_EXPORT_DATA(__type) __type _export
#define JS_DLL_CALLBACK __cdecl __loadds # define JS_DLL_CALLBACK
#define JS_STATIC_DLL_CALLBACK(__x) static __x CALLBACK # define JS_STATIC_DLL_CALLBACK(__x) static __x
#else /* this must be .EXE */
#define JS_EXTERN_API(__type) extern __type _cdecl _export
#define JS_EXPORT_API(__type) __type _cdecl _export
#define JS_EXTERN_DATA(__type) extern __type _export
#define JS_EXPORT_DATA(__type) __type _export
#define JS_DLL_CALLBACK __cdecl __loadds
#define JS_STATIC_DLL_CALLBACK(__x) __x JS_DLL_CALLBACK
#endif /* _WINDLL */
#else /* Unix */ #else /* Unix */
@ -126,44 +116,57 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# if defined(__MWERKS__) || defined(__GNUC__) # if defined(__MWERKS__) || defined(__GNUC__)
# define JS_IMPORT_API(__x) __x # define JS_IMPORT_API(__x) __x
# else # else
# define JS_IMPORT_API(__x) __declspec(dllimport) __x # define JS_IMPORT_API(__x) __declspec(dllimport) __x
# endif # endif
#elif defined(XP_OS2) && defined(__declspec)
# define JS_IMPORT_API(__x) __declspec(dllimport) __x
#else #else
# define JS_IMPORT_API(__x) JS_EXPORT_API (__x) # define JS_IMPORT_API(__x) JS_EXPORT_API (__x)
#endif #endif
#if defined(_WIN32) && !defined(__MWERKS__) #if defined(_WIN32) && !defined(__MWERKS__)
# define JS_IMPORT_DATA(__x) __declspec(dllimport) __x # define JS_IMPORT_DATA(__x) __declspec(dllimport) __x
#elif defined(XP_OS2) && defined(__declspec)
# define JS_IMPORT_DATA(__x) __declspec(dllimport) __x
#else #else
# define JS_IMPORT_DATA(__x) JS_EXPORT_DATA (__x) # define JS_IMPORT_DATA(__x) JS_EXPORT_DATA (__x)
#endif #endif
/* /*
* The linkage of JS API functions differs depending on whether the file is * The linkage of JS API functions differs depending on whether the file is
* used within the JS library or not. Any source file within the JS * used within the JS library or not. Any source file within the JS
* interpreter should define EXPORT_JS_API whereas any client of the library * interpreter should define EXPORT_JS_API whereas any client of the library
* should not. * should not. STATIC_JS_API is used to build JS as a static library.
*/ */
#ifdef EXPORT_JS_API #if defined(STATIC_JS_API)
#define JS_PUBLIC_API(t) JS_EXPORT_API(t)
#define JS_PUBLIC_DATA(t) JS_EXPORT_DATA(t) # define JS_PUBLIC_API(t) t
# define JS_PUBLIC_DATA(t) t
#elif defined(EXPORT_JS_API)
# define JS_PUBLIC_API(t) JS_EXPORT_API(t)
# define JS_PUBLIC_DATA(t) JS_EXPORT_DATA(t)
#else #else
#define JS_PUBLIC_API(t) JS_IMPORT_API(t)
#define JS_PUBLIC_DATA(t) JS_IMPORT_DATA(t) # define JS_PUBLIC_API(t) JS_IMPORT_API(t)
# define JS_PUBLIC_DATA(t) JS_IMPORT_DATA(t)
#endif #endif
#define JS_FRIEND_API(t) JS_PUBLIC_API(t) #define JS_FRIEND_API(t) JS_PUBLIC_API(t)
#define JS_FRIEND_DATA(t) JS_PUBLIC_DATA(t) #define JS_FRIEND_DATA(t) JS_PUBLIC_DATA(t)
#ifdef _WIN32 #if defined(_MSC_VER)
# define JS_INLINE __inline # define JS_INLINE __forceinline
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define JS_INLINE # define JS_INLINE
#else #else
# define JS_INLINE # define JS_INLINE
#endif #endif
/*********************************************************************** /***********************************************************************
@ -174,7 +177,14 @@
** behave syntactically more like functions when called. ** behave syntactically more like functions when called.
***********************************************************************/ ***********************************************************************/
#define JS_BEGIN_MACRO do { #define JS_BEGIN_MACRO do {
#define JS_END_MACRO } while (0)
#if defined(_MSC_VER) && _MSC_VER >= 1400
# define JS_END_MACRO \
} __pragma(warning(push)) __pragma(warning(disable:4127)) \
while (0) __pragma(warning(pop))
#else
# define JS_END_MACRO } while (0)
#endif
/*********************************************************************** /***********************************************************************
** MACROS: JS_BEGIN_EXTERN_C ** MACROS: JS_BEGIN_EXTERN_C
@ -183,11 +193,15 @@
** Macro shorthands for conditional C++ extern block delimiters. ** Macro shorthands for conditional C++ extern block delimiters.
***********************************************************************/ ***********************************************************************/
#ifdef __cplusplus #ifdef __cplusplus
#define JS_BEGIN_EXTERN_C extern "C" {
#define JS_END_EXTERN_C } # define JS_BEGIN_EXTERN_C extern "C" {
# define JS_END_EXTERN_C }
#else #else
#define JS_BEGIN_EXTERN_C
#define JS_END_EXTERN_C # define JS_BEGIN_EXTERN_C
# define JS_END_EXTERN_C
#endif #endif
/*********************************************************************** /***********************************************************************
@ -226,12 +240,12 @@
#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) #if (defined(XP_WIN) && !defined(CROSS_COMPILE)) || defined (WINCE)
# include "jscpucfg.h" /* Use standard Mac or Windows configuration */ # include "jscpucfg.h" /* Use standard Mac or Windows configuration */
#elif defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2) || defined(CROSS_COMPILE) #elif defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2) || defined(CROSS_COMPILE)
# include "jsautocfg.h" /* Use auto-detected configuration */ # include "jsautocfg.h" /* Use auto-detected configuration */
# include "jsosdep.h" /* ...and platform-specific flags */ # include "jsosdep.h" /* ...and platform-specific flags */
#else #else
# error "Must define one of XP_BEOS, XP_OS2, XP_WIN or XP_UNIX" # error "Must define one of XP_BEOS, XP_OS2, XP_WIN or XP_UNIX"
#endif #endif
JS_BEGIN_EXTERN_C JS_BEGIN_EXTERN_C
@ -247,7 +261,7 @@ JS_BEGIN_EXTERN_C
typedef unsigned char JSUint8; typedef unsigned char JSUint8;
typedef signed char JSInt8; typedef signed char JSInt8;
#else #else
#error No suitable type for JSInt8/JSUint8 # error No suitable type for JSInt8/JSUint8
#endif #endif
/************************************************************************ /************************************************************************
@ -260,7 +274,7 @@ typedef signed char JSInt8;
typedef unsigned short JSUint16; typedef unsigned short JSUint16;
typedef short JSInt16; typedef short JSInt16;
#else #else
#error No suitable type for JSInt16/JSUint16 # error No suitable type for JSInt16/JSUint16
#endif #endif
/************************************************************************ /************************************************************************
@ -272,15 +286,15 @@ typedef short JSInt16;
#if JS_BYTES_PER_INT == 4 #if JS_BYTES_PER_INT == 4
typedef unsigned int JSUint32; typedef unsigned int JSUint32;
typedef int JSInt32; typedef int JSInt32;
#define JS_INT32(x) x # define JS_INT32(x) x
#define JS_UINT32(x) x ## U # define JS_UINT32(x) x ## U
#elif JS_BYTES_PER_LONG == 4 #elif JS_BYTES_PER_LONG == 4
typedef unsigned long JSUint32; typedef unsigned long JSUint32;
typedef long JSInt32; typedef long JSInt32;
#define JS_INT32(x) x ## L # define JS_INT32(x) x ## L
#define JS_UINT32(x) x ## UL # define JS_UINT32(x) x ## UL
#else #else
#error No suitable type for JSInt32/JSUint32 # error No suitable type for JSInt32/JSUint32
#endif #endif
/************************************************************************ /************************************************************************
@ -294,28 +308,32 @@ typedef long JSInt32;
** the JSLL_ macros (see jslong.h). ** the JSLL_ macros (see jslong.h).
************************************************************************/ ************************************************************************/
#ifdef JS_HAVE_LONG_LONG #ifdef JS_HAVE_LONG_LONG
#if JS_BYTES_PER_LONG == 8
# if JS_BYTES_PER_LONG == 8
typedef long JSInt64; typedef long JSInt64;
typedef unsigned long JSUint64; typedef unsigned long JSUint64;
#elif defined(WIN16) # elif defined(WIN16)
typedef __int64 JSInt64; typedef __int64 JSInt64;
typedef unsigned __int64 JSUint64; typedef unsigned __int64 JSUint64;
#elif defined(WIN32) && !defined(__GNUC__) # elif defined(WIN32) && !defined(__GNUC__)
typedef __int64 JSInt64; typedef __int64 JSInt64;
typedef unsigned __int64 JSUint64; typedef unsigned __int64 JSUint64;
#else # else
typedef long long JSInt64; typedef long long JSInt64;
typedef unsigned long long JSUint64; typedef unsigned long long JSUint64;
#endif /* JS_BYTES_PER_LONG == 8 */ # endif /* JS_BYTES_PER_LONG == 8 */
#else /* !JS_HAVE_LONG_LONG */ #else /* !JS_HAVE_LONG_LONG */
typedef struct { typedef struct {
#ifdef IS_LITTLE_ENDIAN # ifdef IS_LITTLE_ENDIAN
JSUint32 lo, hi; JSUint32 lo, hi;
#else # else
JSUint32 hi, lo; JSUint32 hi, lo;
#endif #endif
} JSInt64; } JSInt64;
typedef JSInt64 JSUint64; typedef JSInt64 JSUint64;
#endif /* !JS_HAVE_LONG_LONG */ #endif /* !JS_HAVE_LONG_LONG */
/************************************************************************ /************************************************************************
@ -331,7 +349,7 @@ typedef JSInt64 JSUint64;
typedef int JSIntn; typedef int JSIntn;
typedef unsigned int JSUintn; typedef unsigned int JSUintn;
#else #else
#error 'sizeof(int)' not sufficient for platform use # error 'sizeof(int)' not sufficient for platform use
#endif #endif
/************************************************************************ /************************************************************************
@ -362,7 +380,11 @@ typedef ptrdiff_t JSPtrdiff;
** A type for pointer difference. Variables of this type are suitable ** A type for pointer difference. Variables of this type are suitable
** for storing a pointer or pointer sutraction. ** for storing a pointer or pointer sutraction.
************************************************************************/ ************************************************************************/
#if JS_BYTES_PER_WORD == 8 && JS_BYTES_PER_LONG != 8
typedef JSUint64 JSUptrdiff;
#else
typedef unsigned long JSUptrdiff; typedef unsigned long JSUptrdiff;
#endif
/************************************************************************ /************************************************************************
** TYPES: JSBool ** TYPES: JSBool
@ -380,15 +402,20 @@ typedef JSIntn JSBool;
** TYPES: JSPackedBool ** TYPES: JSPackedBool
** DESCRIPTION: ** DESCRIPTION:
** Use JSPackedBool within structs where bitfields are not desireable ** Use JSPackedBool within structs where bitfields are not desireable
** but minimum and consistant overhead matters. ** but minimum and consistent overhead matters.
************************************************************************/ ************************************************************************/
typedef JSUint8 JSPackedBool; typedef JSUint8 JSPackedBool;
/* /*
** A JSWord is an integer that is the same size as a void* ** A JSWord is an integer that is the same size as a void*
*/ */
#if JS_BYTES_PER_WORD == 8 && JS_BYTES_PER_LONG != 8
typedef JSInt64 JSWord;
typedef JSUint64 JSUword;
#else
typedef long JSWord; typedef long JSWord;
typedef unsigned long JSUword; typedef unsigned long JSUword;
#endif
#include "jsotypes.h" #include "jsotypes.h"
@ -409,13 +436,37 @@ typedef unsigned long JSUword;
** **
***********************************************************************/ ***********************************************************************/
#if defined(__GNUC__) && (__GNUC__ > 2) #if defined(__GNUC__) && (__GNUC__ > 2)
#define JS_LIKELY(x) (__builtin_expect((x), 1))
#define JS_UNLIKELY(x) (__builtin_expect((x), 0)) # define JS_LIKELY(x) (__builtin_expect((x), 1))
# define JS_UNLIKELY(x) (__builtin_expect((x), 0))
#else #else
#define JS_LIKELY(x) (x)
#define JS_UNLIKELY(x) (x) # define JS_LIKELY(x) (x)
# define JS_UNLIKELY(x) (x)
#endif #endif
/***********************************************************************
** MACROS: JS_ARRAY_LENGTH
** JS_ARRAY_END
** DESCRIPTION:
** Macros to get the number of elements and the pointer to one past the
** last element of a C array. Use them like this:
**
** jschar buf[10], *s;
** JSString *str;
** ...
** for (s = buf; s != JS_ARRAY_END(buf); ++s) *s = ...;
** ...
** str = JS_NewStringCopyN(cx, buf, JS_ARRAY_LENGTH(buf));
** ...
**
***********************************************************************/
#define JS_ARRAY_LENGTH(array) (sizeof (array) / sizeof (array)[0])
#define JS_ARRAY_END(array) ((array) + JS_ARRAY_LENGTH(array))
JS_END_EXTERN_C JS_END_EXTERN_C
#endif /* jstypes_h___ */ #endif /* jstypes_h___ */

8
src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj
View File

@ -44,7 +44,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1" PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
@ -111,7 +111,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1" PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
@ -178,7 +178,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1" PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
@ -244,7 +244,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1" PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool

8
src/mod/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj
View File

@ -72,7 +72,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
</ClCompile> </ClCompile>
@ -91,7 +91,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
</ClCompile> </ClCompile>
@ -107,7 +107,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
</ClCompile> </ClCompile>
@ -125,7 +125,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
</ClCompile> </ClCompile>