Update of /cvsroot/monetdb/MonetDB/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22834/NT
Modified Files:
Tag: MonetDB_1-20
monetdb_winconfig.h winrules.msc
Log Message:
Include mapilib/Mapi.h and mapi/mapi.h exclusively. This should fix
all problems with including the wrong file on case-insensitive file
systems.
Added support for PCRE on Windows.
Upgraded to PHP-5.2.4.
Define ssize_t in *config.h on Windows so that it is always avaliable.
Make pipe() available on Windows.
Index: monetdb_winconfig.h
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/NT/monetdb_winconfig.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- monetdb_winconfig.h 13 Jul 2007 11:43:37 -0000 1.1
+++ monetdb_winconfig.h 2 Oct 2007 11:51:47 -0000 1.1.4.1
@@ -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.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- winrules.msc 16 Jul 2007 13:43:10 -0000 1.2
+++ winrules.msc 2 Oct 2007 11:51:50 -0000 1.2.4.1
@@ -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
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
