Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 958AD10B80 for ; Tue, 11 Feb 2014 08:08:15 +0000 (UTC) Received: (qmail 89009 invoked by uid 500); 11 Feb 2014 08:07:28 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 88834 invoked by uid 500); 11 Feb 2014 08:07:23 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 87254 invoked by uid 99); 11 Feb 2014 08:07:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Feb 2014 08:07:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D995B9236B6; Tue, 11 Feb 2014 08:07:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Tue, 11 Feb 2014 08:07:30 -0000 Message-Id: <78962b2170594ee8a1117f5592cce363@git.apache.org> In-Reply-To: <77cc6c1304714a0aa0ae4034248f6780@git.apache.org> References: <77cc6c1304714a0aa0ae4034248f6780@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Wed Jan 8 02:28:42 2014 +0100 Committer: Paul J. Davis 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 #include #include -#include +#include #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 #include -#include +#include #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 +#include 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 #include -#include +#include #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 +#include 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} ->