diff options
author | npmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-02-11 04:30:33 +0000 |
---|---|---|
committer | npmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-02-11 04:30:33 +0000 |
commit | 71dcfe5744ae358bc67b1a0b5cfe2f8cfd2b0151 (patch) | |
tree | 1bcf48e85d1241a4fec484d41b4efee84e81627f /libproxy/modules | |
parent | 28fa12244ae076c4d1180c2c34ac2949e2669e3e (diff) | |
download | libproxy-71dcfe5744ae358bc67b1a0b5cfe2f8cfd2b0151.tar.gz |
Add support for building against mozjs or webkit on win32 (via manually set cache variables)
git-svn-id: http://libproxy.googlecode.com/svn/trunk@536 c587cffe-e639-0410-9787-d7902ae8ed56
Diffstat (limited to 'libproxy/modules')
-rw-r--r-- | libproxy/modules/pacrunner_mozjs.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp index 2945b3c..c611b4b 100644 --- a/libproxy/modules/pacrunner_mozjs.cpp +++ b/libproxy/modules/pacrunner_mozjs.cpp @@ -26,6 +26,11 @@ using namespace libproxy; #ifndef JS_HAS_FILE_OBJECT #define JS_HAS_FILE_OBJECT 0 #endif +#ifdef WIN32 +#ifndef XP_WIN +#define XP_WIN +#endif +#endif #include <jsapi.h> #include "pacutils.h" @@ -37,7 +42,7 @@ using namespace libproxy; #define INET6_ADDRSTRLEN 46 #endif -static JSBool dnsResolve(JSContext *cx, JSObject */*obj*/, uintN /*argc*/, jsval *argv, jsval *rval) { +static JSBool dnsResolve(JSContext *cx, JSObject * /*obj*/, uintN /*argc*/, jsval *argv, jsval *rval) { // Get hostname argument char *tmp = JS_strdup(cx, JS_GetStringBytes(JS_ValueToString(cx, argv[0]))); @@ -70,7 +75,7 @@ static JSBool dnsResolve(JSContext *cx, JSObject */*obj*/, uintN /*argc*/, jsval return true; } -static JSBool myIpAddress(JSContext *cx, JSObject *obj, uintN /*argc*/, jsval */*argv*/, jsval *rval) { +static JSBool myIpAddress(JSContext *cx, JSObject *obj, uintN /*argc*/, jsval * /*argv*/, jsval *rval) { char *hostname = (char *) JS_malloc(cx, 1024); if (!gethostname(hostname, 1023)) { JSString *myhost = JS_NewString(cx, hostname, strlen(hostname)); |