Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows build problems (VC9 from Windows 7 SDK) #5

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Windows build problems (VC9 from Windows 7 SDK) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d73a051
Link to static js32.lib, and get Mozilla components from php deps area.
rob-m-johnson Jun 1, 2012
6084d5d
Minor changes to build on Windows, not all essential but tried to fix…
rob-m-johnson Jun 1, 2012
e178e8e
Fix minor build errors and warnings on Windows.
rob-m-johnson Jun 1, 2012
5365468
Fix minor build errors on Windows
rob-m-johnson Jun 1, 2012
4affadc
Pasted Windows build error fix multiple times to remove NULL statemen…
rob-m-johnson Jun 1, 2012
2919952
Windows build errors fixed, NULL ; statement not allowed before decla…
rob-m-johnson Jun 1, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@
// $Revision$
// vim:ft=javascript

// edited to link to static build of spidermonkey,
// and assumes lib and headers are copied to the 'deps' area of the PHP environment.

ARG_WITH("spidermonkey", "spidermonkey support", "no");

if (PHP_SPIDERMONKEY != "no") {
if (CHECK_LIB("js32.lib", "spidermonkey", PHP_SPIDERMONKEY) &&
CHECK_HEADER_ADD_INCLUDE("jsapi.h", "CFLAGS_SPIDERMONKEY", PHP_SPIDERMONKEY + "\\include\\js")) {
CHECK_LIB("winmm.lib", "spidermonkey") &&
CHECK_HEADER_ADD_INCLUDE("jsapi.h", "CFLAGS_SPIDERMONKEY", PHP_SPIDERMONKEY + ";" + PHP_PHP_BUILD + "\\include\\js")) {

EXTENSION("spidermonkey", "spidermonkey.c spidermonkey_context.c spidermonkey_external.c spidermonkey_streams.c");

AC_DEFINE("HAVE_SPIDERMONKEY", 1, "Have SpiderMonkey library");
ADD_FLAG("CFLAGS_SPIDERMONKEY", "/D XP_WIN /D WIN32");
ADD_FLAG("CFLAGS_SPIDERMONKEY", "/D XP_WIN /D WIN32 /D STATIC_JS_API");

} else {
} else {
WARNING("spidermonkey not enabled; libraries and headers not found");
}

Expand Down
3 changes: 2 additions & 1 deletion php_spidermonkey.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* Define Extension Properties */
#define PHP_SPIDERMONKEY_EXTNAME "spidermonkey"
#define PHP_SPIDERMONKEY_MINFO_NAME "SpiderMonkey"
#define PHP_SPIDERMONKEY_EXTVER "@PACKAGE_VERSION@"
#define PHP_SPIDERMONKEY_EXTVER "1.0.0"

/* Import configure options
when building outside of
Expand All @@ -37,6 +37,7 @@

/* Include PHP Standard Header */
#include "php.h"
#include "zend_exceptions.h"
#define XP_UNIX
/* Include JSAPI Header */
#include "jsapi.h"
Expand Down
12 changes: 10 additions & 2 deletions spidermonkey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,20 @@
*/

#include "php_spidermonkey.h"
#include "standard/info.h"

static int le_jscontext_descriptor;

#ifdef __CPP
extern "C" {
#endif

ZEND_DECLARE_MODULE_GLOBALS(spidermonkey);

#ifdef __CPP
}
#endif

zend_module_entry spidermonkey_module_entry = {
STANDARD_MODULE_HEADER,
PHP_SPIDERMONKEY_EXTNAME,
Expand Down Expand Up @@ -70,7 +79,7 @@ static void php_jscontext_object_free_storage(void *object TSRMLS_DC)
* destroy it
*/
if (intern->ct != (JSContext*)NULL)
JS_DestroyContext(intern->ct);
JS_DestroyContext((JSContext *)intern->ct);

if (intern->ec_ht != NULL)
{
Expand Down Expand Up @@ -481,7 +490,6 @@ void zval_to_jsval(zval *val, JSContext *ctx, jsval *jval TSRMLS_DC)
jsref->ht = NULL;
jsref->obj = val;
/* auto define functions for stream */
php_stream *stream;
php_stream_from_zval_no_verify(stream, &val);

if (stream != NULL) {
Expand Down
4 changes: 2 additions & 2 deletions spidermonkey_context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ PHP_METHOD(JSContext, setVersion)
}

intern = (php_jscontext_object *) zend_object_store_get_object(getThis() TSRMLS_CC);
old_version = JS_SetVersion(intern->ct, version);
old_version = JS_SetVersion(intern->ct, (JSVersion)version);

if (JS_GetVersion(intern->ct) == version)
{
Expand Down Expand Up @@ -292,7 +292,7 @@ PHP_METHOD(JSContext, getVersionString)
RETURN_NULL();
}

version_str = JS_VersionToString(version);
version_str = JS_VersionToString((JSVersion)version);
l = strlen(version_str);

RETVAL_STRINGL(estrndup(version_str, l), l, 0);
Expand Down
25 changes: 20 additions & 5 deletions spidermonkey_external.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
/* TODO: change that to an exception */
void reportError(JSContext *cx, const char *message, JSErrorReport *report)
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
/* throw error */
zend_throw_exception(zend_exception_get_default(TSRMLS_C), (char *) message, 0 TSRMLS_CC);
}
Expand Down Expand Up @@ -54,7 +57,10 @@ JSBool generic_call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval
JSBool generic_call(JSContext *cx, uintN argc, jsval *vp)
#endif
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
JSFunction *func;
JSString *jfunc_name;
JSClass *class;
Expand Down Expand Up @@ -149,7 +155,10 @@ JSBool generic_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv
JSBool generic_constructor(JSContext *cx, uintN argc, jsval *vp)
#endif
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
JSFunction *class;
JSString *jclass_name;
char *class_name;
Expand Down Expand Up @@ -307,7 +316,10 @@ JSBool JS_PropertySetterPHP(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
JSBool JS_PropertySetterPHP(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
#endif
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
php_jsobject_ref *jsref;
php_jscontext_object *intern;
JSClass *class;
Expand Down Expand Up @@ -362,7 +374,10 @@ JSBool JS_PropertyGetterPHP(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
JSBool JS_PropertyGetterPHP(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
#endif
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
php_jsobject_ref *jsref;
php_jscontext_object *intern;
JSClass *class;
Expand Down
25 changes: 20 additions & 5 deletions spidermonkey_streams.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ JSBool js_stream_read(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
JSBool js_stream_read(JSContext *cx, uintN argc, jsval *vp)
#endif
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
php_jscontext_object *intern;
php_jsobject_ref *jsref;
php_stream *stream = NULL;
Expand Down Expand Up @@ -99,7 +102,10 @@ JSBool js_stream_getline(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
JSBool js_stream_getline(JSContext *cx, uintN argc, jsval *vp)
#endif
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
php_jscontext_object *intern;
php_jsobject_ref *jsref;
php_stream *stream = NULL;
Expand Down Expand Up @@ -170,7 +176,10 @@ JSBool js_stream_seek(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
JSBool js_stream_seek(JSContext *cx, uintN argc, jsval *vp)
#endif
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
php_jscontext_object *intern;
php_jsobject_ref *jsref;
php_stream *stream = NULL;
Expand Down Expand Up @@ -228,7 +237,10 @@ JSBool js_stream_write(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js
JSBool js_stream_write(JSContext *cx, uintN argc, jsval *vp)
#endif
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
php_jscontext_object *intern;
php_jsobject_ref *jsref;
php_stream *stream = NULL;
Expand Down Expand Up @@ -300,7 +312,10 @@ JSBool js_stream_tell(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
JSBool js_stream_tell(JSContext *cx, uintN argc, jsval *vp)
#endif
{
TSRMLS_FETCH();
#ifdef ZTS
TSRMLS_FETCH(); /* MSVC9 : NULL statement, C compiler won't allow variable definitions below this line.
Cannot compile as C++ because conflict with the name 'class' */
#endif
php_jscontext_object *intern;
php_jsobject_ref *jsref;
php_stream *stream = NULL;
Expand Down