From aeeaa8b3a8a8db5ff85ac2400e28361653605403 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 18 Dec 2006 18:31:38 +0000 Subject: [PATCH] wip git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3697 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/js/Makefile.in | 2 ++ libs/js/src/jsautocfg.h | 26 +++++++++---------- .../mod_spidermonkey/mod_spidermonkey.h | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/libs/js/Makefile.in b/libs/js/Makefile.in index 9c3b658af4..a088bb9d72 100644 --- a/libs/js/Makefile.in +++ b/libs/js/Makefile.in @@ -187,6 +187,8 @@ install: all $(SHTOOL) install -c -m 644 js-config.1 $(DESTDIR)$(mandir)/man1/ $(SHTOOL) install -c -m 644 js.3 $(DESTDIR)$(mandir)/man3/ $(SHTOOL) install -c -m 644 src/js*.h $(DESTDIR)$(includedir)/js/ + $(SHTOOL) install -c -m 644 src/jsopcode.tbl $(DESTDIR)$(includedir)/js/ + $(SHTOOL) install -c -m 644 src/js.msg $(DESTDIR)$(includedir)/js/ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/ $(SHTOOL) install -c -m 644 js.pc $(DESTDIR)$(libdir)/pkgconfig/ $(SHTOOL) install -c -m 755 js-config.sh $(DESTDIR)$(bindir)/js-config diff --git a/libs/js/src/jsautocfg.h b/libs/js/src/jsautocfg.h index 7dccf19bb9..78ed4bda8b 100644 --- a/libs/js/src/jsautocfg.h +++ b/libs/js/src/jsautocfg.h @@ -10,42 +10,42 @@ #define JS_BYTES_PER_SHORT 2L #define JS_BYTES_PER_INT 4L #define JS_BYTES_PER_INT64 8L -#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_LONG 8L #define JS_BYTES_PER_FLOAT 4L #define JS_BYTES_PER_DOUBLE 8L -#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_WORD 8L #define JS_BYTES_PER_DWORD 8L #define JS_BITS_PER_BYTE 8L #define JS_BITS_PER_SHORT 16L #define JS_BITS_PER_INT 32L #define JS_BITS_PER_INT64 64L -#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_LONG 64L #define JS_BITS_PER_FLOAT 32L #define JS_BITS_PER_DOUBLE 64L -#define JS_BITS_PER_WORD 32L +#define JS_BITS_PER_WORD 64L #define JS_BITS_PER_BYTE_LOG2 3L #define JS_BITS_PER_SHORT_LOG2 4L #define JS_BITS_PER_INT_LOG2 5L #define JS_BITS_PER_INT64_LOG2 6L -#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_LONG_LOG2 6L #define JS_BITS_PER_FLOAT_LOG2 5L #define JS_BITS_PER_DOUBLE_LOG2 6L -#define JS_BITS_PER_WORD_LOG2 5L +#define JS_BITS_PER_WORD_LOG2 6L #define JS_ALIGN_OF_SHORT 2L #define JS_ALIGN_OF_INT 4L -#define JS_ALIGN_OF_LONG 4L -#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_LONG 8L +#define JS_ALIGN_OF_INT64 8L #define JS_ALIGN_OF_FLOAT 4L -#define JS_ALIGN_OF_DOUBLE 4L -#define JS_ALIGN_OF_POINTER 4L -#define JS_ALIGN_OF_WORD 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 8L +#define JS_ALIGN_OF_WORD 8L -#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_WORD_LOG2 3L #define JS_BYTES_PER_DWORD_LOG2 3L -#define JS_WORDS_PER_DWORD_LOG2 1L +#define JS_WORDS_PER_DWORD_LOG2 0L #define JS_STACK_GROWTH_DIRECTION (-1) diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h index 258dd4f524..3e84d0ebf0 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h @@ -76,7 +76,7 @@ SWITCH_BEGIN_EXTERN_C #define SWITCH_SM_DECLARE(type) type #endif -static int eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval) +int eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval) { JSScript *script = NULL; char *cptr;