You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ra...@apache.org on 2011/07/15 09:54:37 UTC
svn commit: r1147001 - in /couchdb/trunk: THANKS configure.ac
src/ejson/Makefile.am src/ejson/yajl/yajl_gen.c src/snappy/Makefile.am
Author: randall
Date: Fri Jul 15 07:54:36 2011
New Revision: 1147001
URL: http://svn.apache.org/viewvc?rev=1147001&view=rev
Log:
Fix COUCHDB-1197 - NIFs, .dll fixes for Windows
Many thanks, Dave Cottlehuber.
Modified:
couchdb/trunk/THANKS
couchdb/trunk/configure.ac
couchdb/trunk/src/ejson/Makefile.am
couchdb/trunk/src/ejson/yajl/yajl_gen.c
couchdb/trunk/src/snappy/Makefile.am
Modified: couchdb/trunk/THANKS
URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=1147001&r1=1147000&r2=1147001&view=diff
==============================================================================
--- couchdb/trunk/THANKS (original)
+++ couchdb/trunk/THANKS Fri Jul 15 07:54:36 2011
@@ -84,6 +84,7 @@ suggesting improvements or submitting ch
* Caolan McMahon <ca...@googlemail.com>
* Andrey Somov <tr...@gmail.com>
* Chris Coulson <chrisccoulson.googlemail.com>
+ * Dave Cottlehuber <da...@muse.net.nz>
For a list of authors see the `AUTHORS` file.
Modified: couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=1147001&r1=1147000&r2=1147001&view=diff
==============================================================================
--- couchdb/trunk/configure.ac (original)
+++ couchdb/trunk/configure.ac Fri Jul 15 07:54:36 2011
@@ -28,6 +28,7 @@ AC_ENABLE_SHARED
AC_DISABLE_STATIC
AC_PROG_CC
+LT_INIT([win32-dll])
AC_PROG_LIBTOOL
AC_PROG_LN_S
Modified: couchdb/trunk/src/ejson/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ejson/Makefile.am?rev=1147001&r1=1147000&r2=1147001&view=diff
==============================================================================
--- couchdb/trunk/src/ejson/Makefile.am (original)
+++ couchdb/trunk/src/ejson/Makefile.am Fri Jul 15 07:54:36 2011
@@ -70,13 +70,16 @@ ejson_la_LDFLAGS = -module -avoid-versio
if WINDOWS
ejson_la_LDFLAGS += -no-undefined
+EJSON_SO_NAME = ejson.dll
+else
+EJSON_SO_NAME = ejson.so
endif
-priv/ejson.so: ejson.la
+priv/$(EJSON_SO_NAME): ejson.la
@mkdir -p ./priv
- cp .libs/ejson.so $@
+ cp .libs/$(EJSON_SO_NAME) $@
-all: priv/ejson.so
+all: priv/$(EJSON_SO_NAME)
endif
%.app: %.app.in
Modified: couchdb/trunk/src/ejson/yajl/yajl_gen.c
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ejson/yajl/yajl_gen.c?rev=1147001&r1=1147000&r2=1147001&view=diff
==============================================================================
--- couchdb/trunk/src/ejson/yajl/yajl_gen.c (original)
+++ couchdb/trunk/src/ejson/yajl/yajl_gen.c Fri Jul 15 07:54:36 2011
@@ -189,7 +189,7 @@ yajl_gen_integer(yajl_gen g, long int nu
return yajl_gen_status_ok;
}
-#ifdef WIN32
+#if defined(_WIN32) || defined(WIN32) || defined(__WIN32__)
#include <float.h>
#define isnan _isnan
#define isinf !_finite
Modified: couchdb/trunk/src/snappy/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/snappy/Makefile.am?rev=1147001&r1=1147000&r2=1147001&view=diff
==============================================================================
--- couchdb/trunk/src/snappy/Makefile.am (original)
+++ couchdb/trunk/src/snappy/Makefile.am Fri Jul 15 07:54:36 2011
@@ -54,13 +54,17 @@ snappy_nif_la_LDFLAGS = -module -avoid-v
if WINDOWS
snappy_nif_la_LDFLAGS += -no-undefined
+snappy_nif_la_CXXFLAGS += -EHsc
+SNAPPY_SO_NAME = snappy_nif.dll
+else
+SNAPPY_SO_NAME = snappy_nif.so
endif
-priv/snappy_nif.so: snappy_nif.la
+priv/$(SNAPPY_SO_NAME): snappy_nif.la
@mkdir -p ./priv
- cp .libs/snappy_nif.so $@
+ cp .libs/$(SNAPPY_SO_NAME) $@
-all: priv/snappy_nif.so
+all: priv/$(SNAPPY_SO_NAME)
endif
%.app: %.app.in