Update of /cvsroot/monetdb/MonetDB/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2811/NT
Modified Files:
monetdb_winconfig.h winrules.msc
Log Message:
propagated changes of Monday Sep 24 2007 - Wednesday Oct 03 2007
from the MonetDB_1-20 branch to the development trunk
Index: monetdb_winconfig.h
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/NT/monetdb_winconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- monetdb_winconfig.h 13 Jul 2007 11:43:37 -0000 1.1
+++ monetdb_winconfig.h 3 Oct 2007 13:59:59 -0000 1.2
@@ -208,6 +208,7 @@
/* #undef HAVE_LIBPCL */
/* Define if you have the pcre library */
+/* This is actually defined in the appropriate rules.msc file */
/* #undef HAVE_LIBPCRE */
/* Define if you have the perfctr library */
@@ -305,11 +306,8 @@
/* #undef HAVE_PERFMON_PFMLIB_H */
/* Define to 1 if you have the `pipe' function. */
-/* #undef HAVE_PIPE */
-/* this might also work (untested):
#define HAVE_PIPE 1
-#define pipe(p) _pipe(p, 4096, O_BINARY)
-*/
+#define pipe(p) _pipe(p, 8192, O_BINARY)
/* Define to 1 if you have the `posix_fadvise' function. */
/* #undef HAVE_POSIX_FADVISE */
@@ -376,6 +374,7 @@
#define HAVE_SOCKLEN_T 1
/* Define to 1 if the system has the type `ssize_t'. */
+/* see below */
/* #undef HAVE_SSIZE_T */
/* Define to 1 if you have the <stdint.h> header file. */
@@ -655,6 +654,8 @@
/* The size of a `size_t', as computed by sizeof. */
#define SIZEOF_SIZE_T 8
+typedef __int64 ssize_t;
+#define HAVE_SSIZE_T 1
/* The size of a `void *', as computed by sizeof. */
#define SIZEOF_VOID_P 8
@@ -671,6 +672,8 @@
/* The size of a `ssize_t', as computed by sizeof. */
#define SIZEOF_SSIZE_T SIZEOF_SIZE_T
+typedef int ssize_t;
+#define HAVE_SSIZE_T 1
/* The size of a `__int64', as computed by sizeof. */
#define SIZEOF___INT64 8
Index: winrules.msc
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/NT/winrules.msc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- winrules.msc 16 Jul 2007 13:43:10 -0000 1.2
+++ winrules.msc 3 Oct 2007 14:00:00 -0000 1.3
@@ -21,8 +21,8 @@
PTHREAD = C:\Pthreads
PTHREAD_INCS = "-I$(PTHREAD)\include"
PTHREAD_LIBS = "$(PTHREAD)\lib\pthreadVC2.lib"
-PHP_SRCDIR = $(TOPDIR)\..\..\php-5.2.1
-PHP_INSTDIR = C:\php-5
+PHP_INSTDIR = C:\php-524
+PHP_SRCDIR = $(PHP_INSTDIR)\php-5.2.4
# for these, also see configure.py
PHP_EXTENSIONDIR = lib\php5
@@ -100,7 +100,7 @@
FILTER=find /v
FILTER=grep -v -F
-CONFIGURE=$(PYTHON) "$(TOPDIR)\..\..\MonetDB\conf\configure.py"
"CLIENTS_BUILD=$(CLIENTS_BUILD)" "CLIENTS_PREFIX=$(CLIENTS_PREFIX)"
"CLIENTS_SOURCE=$(CLIENTS_SOURCE)" "DOCTOOLS_FALSE=$(DOCTOOLS_FALSE)"
"exec_prefix=$(exec_prefix)" "HAVE_JAVA_FALSE=$(HAVE_JAVA_FALSE)"
"HAVE_MONETDB4_FALSE=$(HAVE_MONETDB4_FALSE)"
"HAVE_MONETDB5_FALSE=$(HAVE_MONETDB5_FALSE)"
"HAVE_PCRE_FALSE=$(HAVE_PCRE_FALSE)"
"HAVE_PERL_DEVEL_FALSE=$(HAVE_PERL_DEVEL_FALSE)"
"HAVE_PERL_FALSE=$(HAVE_PERL_FALSE)" "HAVE_PHP_FALSE=$(HAVE_PHP_FALSE)"
"HAVE_PYTHON_DEVEL_FALSE=$(HAVE_PYTHON_DEVEL_FALSE)"
"HAVE_PYTHON_FALSE=$(HAVE_PYTHON_FALSE)"
"HAVE_PYTHON_SWIG_FALSE=$(HAVE_PYTHON_SWIG_FALSE)"
"HAVE_SWIG_FALSE=$(HAVE_SWIG_FALSE)" "JDBCCLIENT_JAR=$(JDBCCLIENT_JAR)"
"LIBICONV=$(LIBICONV)" "LIBXML2=$(LIBXML2)" "LIBZLIB=$(LIBZLIB)"
"MONETDB4_BUILD=$(MONETDB4_BUILD)" "MONETDB4_PREFIX=$(MONETDB4_PREFIX)"
"MONETDB4_SOURCE=$(MONETDB4_SOURCE)" "MONETDB5_BUILD=$(MONETDB5_BUILD)"
"MONETDB5_PREFIX=$(MONETDB5_PREFIX)" "MONETDB5_
SOURCE=$(MONETDB5_SOURCE)" "MONETDB_BUILD=$(MONETDB_BUILD)"
"MONETDB_PREFIX=$(MONETDB_PREFIX)" "MONETDB_SOURCE=$(MONETDB_SOURCE)"
"PACKAGE=$(pkg)" "PATHFINDER_BUILD=$(PATHFINDER_BUILD)"
"PATHFINDER_SOURCE=$(PATHFINDER_SOURCE)" "PHP_EXTENSIONDIR=$(PHP_EXTENSIONDIR)"
"prefix=$(prefix)" "PROFILING_FALSE=$(PROFILING_FALSE)" "PYTHON=$(PYTHON)"
"SQL_BUILD=$(SQL_BUILD)" "SQL_SOURCE=$(SQL_SOURCE)" "TOPDIR=$(TOPDIR)"
"VERSION=$(VERSION)"
+CONFIGURE=$(PYTHON) "$(TOPDIR)\..\..\MonetDB\conf\configure.py"
"CLIENTS_BUILD=$(CLIENTS_BUILD)" "CLIENTS_PREFIX=$(CLIENTS_PREFIX)"
"CLIENTS_SOURCE=$(CLIENTS_SOURCE)" "DOCTOOLS_FALSE=$(DOCTOOLS_FALSE)"
"exec_prefix=$(exec_prefix)" "HAVE_JAVA_FALSE=$(HAVE_JAVA_FALSE)"
"HAVE_MONETDB4_FALSE=$(HAVE_MONETDB4_FALSE)"
"HAVE_MONETDB5_FALSE=$(HAVE_MONETDB5_FALSE)"
"HAVE_PCRE_FALSE=$(HAVE_PCRE_FALSE)"
"HAVE_PERL_DEVEL_FALSE=$(HAVE_PERL_DEVEL_FALSE)"
"HAVE_PERL_FALSE=$(HAVE_PERL_FALSE)"
"HAVE_PERL_SWIG_FALSE=$(HAVE_PERL_SWIG_FALSE)"
"HAVE_PHP_FALSE=$(HAVE_PHP_FALSE)"
"HAVE_PYTHON_DEVEL_FALSE=$(HAVE_PYTHON_DEVEL_FALSE)"
"HAVE_PYTHON_FALSE=$(HAVE_PYTHON_FALSE)"
"HAVE_PYTHON_SWIG_FALSE=$(HAVE_PYTHON_SWIG_FALSE)"
"HAVE_SWIG_FALSE=$(HAVE_SWIG_FALSE)" "JDBCCLIENT_JAR=$(JDBCCLIENT_JAR)"
"LIBICONV=$(LIBICONV)" "LIBXML2=$(LIBXML2)" "LIBZLIB=$(LIBZLIB)"
"MONETDB4_BUILD=$(MONETDB4_BUILD)" "MONETDB4_PREFIX=$(MONETDB4_PREFIX)"
"MONETDB4_SOURCE=$(MONETDB4_SOURCE)" "MONETDB5_BUILD=$(MONETDB5_BUILD)"
"MONETDB5_PREFIX=$(MONETDB5_PREFIX)" "MONETDB5_SOURCE=$(MONETDB5_SOURCE)"
"MONETDB_BUILD=$(MONETDB_BUILD)" "MONETDB_PREFIX=$(MONETDB_PREFIX)"
"MONETDB_SOURCE=$(MONETDB_SOURCE)" "PACKAGE=$(pkg)"
"PATHFINDER_BUILD=$(PATHFINDER_BUILD)" "PATHFINDER_SOURCE=$(PATHFINDER_SOURCE)"
"PHP_EXTENSIONDIR=$(PHP_EXTENSIONDIR)" "prefix=$(prefix)"
"PROFILING_FALSE=$(PROFILING_FALSE)" "PYTHON=$(PYTHON)"
"SQL_BUILD=$(SQL_BUILD)" "SQL_SOURCE=$(SQL_SOURCE)" "TOPDIR=$(TOPDIR)"
"VERSION=$(VERSION)"
# Use "nmake DEBUG=1" to get a debug build (assertions enabled);
# use "nmake NDEBUG=1" to get a release build (assertions disabled);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
