couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From beno...@apache.org
Subject git commit: updated refs/heads/1994-merge-rcouch to 94fe661
Date Tue, 07 Jan 2014 21:55:13 GMT
Updated Branches:
  refs/heads/1994-merge-rcouch b6f6b5e07 -> 94fe66123


fix build on macosx


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/94fe6612
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/94fe6612
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/94fe6612

Branch: refs/heads/1994-merge-rcouch
Commit: 94fe661233f69faa8cfbcb71d0202eb9bca4600f
Parents: b6f6b5e
Author: Benoit Chesneau <bchesneau@gmail.com>
Authored: Tue Jan 7 22:42:39 2014 +0100
Committer: Benoit Chesneau <bchesneau@gmail.com>
Committed: Tue Jan 7 22:42:39 2014 +0100

----------------------------------------------------------------------
 apps/couch/c_src/couch_js/http.c | 2 +-
 apps/couch/c_src/couch_js/main.c | 2 +-
 apps/couch/c_src/couch_js/utf8.c | 2 +-
 apps/couch/c_src/couch_js/util.c | 2 +-
 apps/couch/c_src/couch_js/util.h | 2 +-
 apps/couch/rebar.config.script   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/94fe6612/apps/couch/c_src/couch_js/http.c
----------------------------------------------------------------------
diff --git a/apps/couch/c_src/couch_js/http.c b/apps/couch/c_src/couch_js/http.c
index 3baa59d..da29b5f 100644
--- a/apps/couch/c_src/couch_js/http.c
+++ b/apps/couch/c_src/couch_js/http.c
@@ -16,7 +16,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <jsapi.h>
+#include <js/jsapi.h>
 #include "utf8.h"
 #include "util.h"
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/94fe6612/apps/couch/c_src/couch_js/main.c
----------------------------------------------------------------------
diff --git a/apps/couch/c_src/couch_js/main.c b/apps/couch/c_src/couch_js/main.c
index a0fc143..d4f4ef0 100644
--- a/apps/couch/c_src/couch_js/main.c
+++ b/apps/couch/c_src/couch_js/main.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <jsapi.h>
+#include <js/jsapi.h>
 #include "http.h"
 #include "utf8.h"
 #include "util.h"

http://git-wip-us.apache.org/repos/asf/couchdb/blob/94fe6612/apps/couch/c_src/couch_js/utf8.c
----------------------------------------------------------------------
diff --git a/apps/couch/c_src/couch_js/utf8.c b/apps/couch/c_src/couch_js/utf8.c
index 2b3735a..75a4315 100644
--- a/apps/couch/c_src/couch_js/utf8.c
+++ b/apps/couch/c_src/couch_js/utf8.c
@@ -10,7 +10,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include <jsapi.h>
+#include <js/jsapi.h>
 
 static int
 enc_char(uint8 *utf8Buffer, uint32 ucs4Char)

http://git-wip-us.apache.org/repos/asf/couchdb/blob/94fe6612/apps/couch/c_src/couch_js/util.c
----------------------------------------------------------------------
diff --git a/apps/couch/c_src/couch_js/util.c b/apps/couch/c_src/couch_js/util.c
index 9b46ceb..ef984d1 100644
--- a/apps/couch/c_src/couch_js/util.c
+++ b/apps/couch/c_src/couch_js/util.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <jsapi.h>
+#include <js/jsapi.h>
 
 #include "help.h"
 #include "util.h"

http://git-wip-us.apache.org/repos/asf/couchdb/blob/94fe6612/apps/couch/c_src/couch_js/util.h
----------------------------------------------------------------------
diff --git a/apps/couch/c_src/couch_js/util.h b/apps/couch/c_src/couch_js/util.h
index 65a2a06..a1e2b6c 100644
--- a/apps/couch/c_src/couch_js/util.h
+++ b/apps/couch/c_src/couch_js/util.h
@@ -13,7 +13,7 @@
 #ifndef COUCHJS_UTIL_H
 #define COUCHJS_UTIL_H
 
-#include <jsapi.h>
+#include <js/jsapi.h>
 
 typedef struct {
     int          use_http;

http://git-wip-us.apache.org/repos/asf/couchdb/blob/94fe6612/apps/couch/rebar.config.script
----------------------------------------------------------------------
diff --git a/apps/couch/rebar.config.script b/apps/couch/rebar.config.script
index ca79b39..ab4501d 100644
--- a/apps/couch/rebar.config.script
+++ b/apps/couch/rebar.config.script
@@ -69,7 +69,7 @@ GetFlag = fun(Name, Default) ->
 
 
 JSLIBS = GetFlag("JS_LIBS", "-lmozjs185"),
-JSCFLAGS = GetFlag("JS_CFLAGS", "-I/usr/include/js"),
+JSCFLAGS = GetFlag("JS_CFLAGS", "$CFLAGS"),
 
 {CFLAGS, LDFLAGS}  = case os:type() of
     {unix, darwin} ->


Mime
View raw message