Update of /cvsroot/monetdb/clients/src/php/Cimpl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19497/src/php/Cimpl

Modified Files:
      Tag: Clients_1-20
        Makefile.ag php_monetdb.h 
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: php_monetdb.h
===================================================================
RCS file: /cvsroot/monetdb/clients/src/php/Cimpl/php_monetdb.h,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- php_monetdb.h       28 Mar 2007 19:54:23 -0000      1.2
+++ php_monetdb.h       2 Oct 2007 11:49:40 -0000       1.2.4.1
@@ -129,7 +129,7 @@
 # undef _POSIX_C_SOURCE
 #endif
 
-#include "Mapi.h"
+#include "mapilib/Mapi.h"
 /* typedefs for convenience; not using Mapi's as those already are a
  * pointer to the struct*/
 typedef struct MapiStruct Mconn;

Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/src/php/Cimpl/Makefile.ag,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- Makefile.ag 12 Apr 2007 09:33:56 -0000      1.4
+++ Makefile.ag 2 Oct 2007 11:49:36 -0000       1.4.4.1
@@ -16,8 +16,8 @@
 
 MTSAFE
 
-SWIGFLAGS = -I../../mapilib
-INCLUDES = ../../mapilib $(MONETDB_INCS) @PHP_INCS@
+SWIGFLAGS = -I../..
+INCLUDES = ../.. $(MONETDB_INCS) @PHP_INCS@
 
 # we need this flag to allow for a name that does not start with "lib"
 monetdb_la_LDFLAGS = -module


-------------------------------------------------------------------------
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

Reply via email to