Update of /cvsroot/monetdb/MonetDB/src/common
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8033/src/common
Modified Files:
Makefile.ag stream.mx
Log Message:
Get this thing compiled on Windows again.
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/common/Makefile.ag,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.ag 12 Sep 2007 10:54:16 -0000 1.28
+++ Makefile.ag 7 Dec 2007 11:58:31 -0000 1.29
@@ -27,12 +27,12 @@
HEADERS = h
}
-INCLUDES = $(Z_CFLAGS) $(BZ_CFLAGS) $(OPENSSL_INCS) $(CURL_INCS)
+INCLUDES = $(Z_CFLAGS) $(BZ_CFLAGS) $(OPENSSL_INCS) $(CURL_INCS)
$(ICONV_CFLAGS)
lib_stream = {
SOURCES = stream.mx dummy_gdk_utils.mx
HEADERS = h
- LIBS = libmutils $(SOCKET_LIBS) $(Z_LIBS) $(BZ_LIBS) $(OPENSSL_LIBS)
$(CURL_LIBS)
+ LIBS = libmutils $(SOCKET_LIBS) $(Z_LIBS) $(BZ_LIBS) $(OPENSSL_LIBS)
$(CURL_LIBS) $(ICONV_LIBS)
}
headers_py = {
Index: stream.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/common/stream.mx,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- stream.mx 6 Dec 2007 19:09:07 -0000 1.152
+++ stream.mx 7 Dec 2007 11:58:31 -0000 1.153
@@ -308,6 +308,10 @@
#define INVALID_SOCKET (-1)
#endif
+#ifdef NATIVE_WIN32
+#define pclose _pclose
+#endif
+
struct stream {
short byteorder;
short access; /* read/write */
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
