You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/11 09:07:30 UTC
[28/41] couch commit: updated refs/heads/import-rcouch to f07bbfc
Revert "fix build on macosx"
This reverts commit 94fe661233f69faa8cfbcb71d0202eb9bca4600f.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/5ead9289
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/5ead9289
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/5ead9289
Branch: refs/heads/import-rcouch
Commit: 5ead928916dcb2f083f9b5cddd43d0bad7f7da43
Parents: 370ab88
Author: benoitc <be...@apache.org>
Authored: Wed Jan 8 02:28:42 2014 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Tue Feb 11 02:05:20 2014 -0600
----------------------------------------------------------------------
c_src/couch_js/http.c | 2 +-
c_src/couch_js/main.c | 2 +-
c_src/couch_js/utf8.c | 2 +-
c_src/couch_js/util.c | 2 +-
c_src/couch_js/util.h | 2 +-
rebar.config.script | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5ead9289/c_src/couch_js/http.c
----------------------------------------------------------------------
diff --git a/c_src/couch_js/http.c b/c_src/couch_js/http.c
index da29b5f..3baa59d 100644
--- a/c_src/couch_js/http.c
+++ b/c_src/couch_js/http.c
@@ -16,7 +16,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <js/jsapi.h>
+#include <jsapi.h>
#include "utf8.h"
#include "util.h"
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5ead9289/c_src/couch_js/main.c
----------------------------------------------------------------------
diff --git a/c_src/couch_js/main.c b/c_src/couch_js/main.c
index d4f4ef0..a0fc143 100644
--- a/c_src/couch_js/main.c
+++ b/c_src/couch_js/main.c
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <string.h>
-#include <js/jsapi.h>
+#include <jsapi.h>
#include "http.h"
#include "utf8.h"
#include "util.h"
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5ead9289/c_src/couch_js/utf8.c
----------------------------------------------------------------------
diff --git a/c_src/couch_js/utf8.c b/c_src/couch_js/utf8.c
index 75a4315..2b3735a 100644
--- a/c_src/couch_js/utf8.c
+++ b/c_src/couch_js/utf8.c
@@ -10,7 +10,7 @@
// License for the specific language governing permissions and limitations under
// the License.
-#include <js/jsapi.h>
+#include <jsapi.h>
static int
enc_char(uint8 *utf8Buffer, uint32 ucs4Char)
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5ead9289/c_src/couch_js/util.c
----------------------------------------------------------------------
diff --git a/c_src/couch_js/util.c b/c_src/couch_js/util.c
index ef984d1..9b46ceb 100644
--- a/c_src/couch_js/util.c
+++ b/c_src/couch_js/util.c
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <string.h>
-#include <js/jsapi.h>
+#include <jsapi.h>
#include "help.h"
#include "util.h"
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5ead9289/c_src/couch_js/util.h
----------------------------------------------------------------------
diff --git a/c_src/couch_js/util.h b/c_src/couch_js/util.h
index a1e2b6c..65a2a06 100644
--- a/c_src/couch_js/util.h
+++ b/c_src/couch_js/util.h
@@ -13,7 +13,7 @@
#ifndef COUCHJS_UTIL_H
#define COUCHJS_UTIL_H
-#include <js/jsapi.h>
+#include <jsapi.h>
typedef struct {
int use_http;
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5ead9289/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index ab4501d..ca79b39 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -69,7 +69,7 @@ GetFlag = fun(Name, Default) ->
JSLIBS = GetFlag("JS_LIBS", "-lmozjs185"),
-JSCFLAGS = GetFlag("JS_CFLAGS", "$CFLAGS"),
+JSCFLAGS = GetFlag("JS_CFLAGS", "-I/usr/include/js"),
{CFLAGS, LDFLAGS} = case os:type() of
{unix, darwin} ->