diff options
| author | Robert Newson <robert.newson@cloudant.com> | 2011-10-31 18:36:54 +0000 |
|---|---|---|
| committer | Robert Newson <robert.newson@cloudant.com> | 2011-10-31 18:54:51 +0000 |
| commit | 8bbd833f866c8dfdaaf06f3dc5a5ca06030504e8 (patch) | |
| tree | c5da36c09f33c689a70d99480327140362031d8e /couchjs/c_src/sm185.c | |
| parent | a6352493651f6f8e3430269555421b5599a77809 (diff) | |
| parent | af7a6ae52890c6c158615068f2a48d40c52ec538 (diff) | |
Merge commit '1.1.1' into 0.4.x
Conflicts:
acinclude.m4.in
configure.ac
couchjs/c_src/http.c
src/erlang-oauth/Makefile.am
src/erlang-oauth/oauth.app.in
src/erlang-oauth/oauth_hmac_sha1.erl
src/erlang-oauth/oauth_http.erl
src/erlang-oauth/oauth_plaintext.erl
src/etap/etap_web.erl
Diffstat (limited to 'couchjs/c_src/sm185.c')
| -rw-r--r-- | couchjs/c_src/sm185.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/couchjs/c_src/sm185.c b/couchjs/c_src/sm185.c index 9815f15c..a7258460 100644 --- a/couchjs/c_src/sm185.c +++ b/couchjs/c_src/sm185.c @@ -310,7 +310,7 @@ main(int argc, const char* argv[]) JSObject* global = NULL; JSCrossCompartmentCall *call = NULL; JSObject* klass = NULL; - JSObject* script; + JSSCRIPT_TYPE script; JSString* scriptsrc; const jschar* schars; size_t slen; |