couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r954951 - in /couchdb/branches/0.11.x/src/couchdb/priv: Makefile.am couch_js/http.c
Date Tue, 15 Jun 2010 16:28:39 GMT
Author: jan
Date: Tue Jun 15 16:28:39 2010
New Revision: 954951

URL: http://svn.apache.org/viewvc?rev=954951&view=rev
Log:
Fix warnings on Linux builds.

Patch by Paul Davis.

Closes COUCHDB-775

Modified:
    couchdb/branches/0.11.x/src/couchdb/priv/Makefile.am
    couchdb/branches/0.11.x/src/couchdb/priv/couch_js/http.c

Modified: couchdb/branches/0.11.x/src/couchdb/priv/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/priv/Makefile.am?rev=954951&r1=954950&r2=954951&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/priv/Makefile.am (original)
+++ couchdb/branches/0.11.x/src/couchdb/priv/Makefile.am Tue Jun 15 16:28:39 2010
@@ -47,7 +47,7 @@ COUCHJS_SRCS = \
 locallibbin_PROGRAMS = couchjs
 couchjs_SOURCES = $(COUCHJS_SRCS)
 couchjs_LDFLAGS = $(CURL_LDFLAGS)
-couchjs_CFLAGS = $(CURL_CFLAGS)
+couchjs_CFLAGS = -D_BSD_SOURCE $(CURL_CFLAGS)
 couchjs_LDADD = $(CURL_LDFLAGS) @JSLIB@
 
 couchpriv_DATA = stat_descriptions.cfg

Modified: couchdb/branches/0.11.x/src/couchdb/priv/couch_js/http.c
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/priv/couch_js/http.c?rev=954951&r1=954950&r2=954951&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/priv/couch_js/http.c (original)
+++ couchdb/branches/0.11.x/src/couchdb/priv/couch_js/http.c Tue Jun 15 16:28:39 2010
@@ -10,6 +10,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <jsapi.h>
@@ -403,7 +404,8 @@ go(JSContext* cx, JSObject* obj, HTTPDat
     {
         HTTP_HANDLE = curl_easy_init();
         curl_easy_setopt(HTTP_HANDLE, CURLOPT_READFUNCTION, send_body);
-        curl_easy_setopt(HTTP_HANDLE, CURLOPT_SEEKFUNCTION, seek_body);
+        curl_easy_setopt(HTTP_HANDLE, CURLOPT_SEEKFUNCTION,
+                                        (curl_seek_callback) seek_body);
         curl_easy_setopt(HTTP_HANDLE, CURLOPT_HEADERFUNCTION, recv_header);
         curl_easy_setopt(HTTP_HANDLE, CURLOPT_WRITEFUNCTION, recv_body);
         curl_easy_setopt(HTTP_HANDLE, CURLOPT_NOPROGRESS, 1);



Mime
View raw message