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 675BC10A60 for ; Thu, 6 Feb 2014 17:41:15 +0000 (UTC) Received: (qmail 58820 invoked by uid 500); 6 Feb 2014 17:40:13 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 58001 invoked by uid 500); 6 Feb 2014 17:39:50 -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 57739 invoked by uid 99); 6 Feb 2014 17:39:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Feb 2014 17:39:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F2AC98A360D; Thu, 6 Feb 2014 17:39:43 +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: Thu, 06 Feb 2014 17:40:15 -0000 Message-Id: In-Reply-To: <30dad969d8734713a3ea4c9b315f7fa7@git.apache.org> References: <30dad969d8734713a3ea4c9b315f7fa7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] couch commit: updated refs/heads/import-rcouch to e2dbc79 fix build on macosx Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/856f4e01 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/856f4e01 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/856f4e01 Branch: refs/heads/import-rcouch Commit: 856f4e01779ce1905a0f29a385fa19d16c55f3a9 Parents: 4937fad Author: benoitc Authored: Tue Jan 7 22:42:39 2014 +0100 Committer: Paul J. Davis Committed: Thu Feb 6 11:38:29 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/856f4e01/c_src/couch_js/http.c ---------------------------------------------------------------------- diff --git a/c_src/couch_js/http.c b/c_src/couch_js/http.c index 3baa59d..da29b5f 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/856f4e01/c_src/couch_js/main.c ---------------------------------------------------------------------- diff --git a/c_src/couch_js/main.c b/c_src/couch_js/main.c index a0fc143..d4f4ef0 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/856f4e01/c_src/couch_js/utf8.c ---------------------------------------------------------------------- diff --git a/c_src/couch_js/utf8.c b/c_src/couch_js/utf8.c index 2b3735a..75a4315 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/856f4e01/c_src/couch_js/util.c ---------------------------------------------------------------------- diff --git a/c_src/couch_js/util.c b/c_src/couch_js/util.c index 9b46ceb..ef984d1 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/856f4e01/c_src/couch_js/util.h ---------------------------------------------------------------------- diff --git a/c_src/couch_js/util.h b/c_src/couch_js/util.h index 65a2a06..a1e2b6c 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/856f4e01/rebar.config.script ---------------------------------------------------------------------- diff --git a/rebar.config.script b/rebar.config.script index ca79b39..ab4501d 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", "-I/usr/include/js"), +JSCFLAGS = GetFlag("JS_CFLAGS", "$CFLAGS"), {CFLAGS, LDFLAGS} = case os:type() of {unix, darwin} ->