Update of /cvsroot/monetdb/clients/src/mapiclient
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19497/src/mapiclient
Modified Files:
Tag: Clients_1-20
Makefile.ag MapiClient.mx ReadlineTools.mx dump.c msqldump.c
prompt.c
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: ReadlineTools.mx
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/ReadlineTools.mx,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- ReadlineTools.mx 15 Sep 2007 08:13:13 -0000 1.4
+++ ReadlineTools.mx 2 Oct 2007 11:49:12 -0000 1.4.2.1
@@ -33,7 +33,7 @@
*/
#include "clients_config.h"
#include <monet_options.h>
-#include "Mapi.h"
+#include "mapilib/Mapi.h"
#ifdef HAVE_LIBREADLINE
Index: msqldump.c
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/msqldump.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- msqldump.c 11 Sep 2007 12:59:08 -0000 1.5
+++ msqldump.c 2 Oct 2007 11:49:16 -0000 1.5.2.1
@@ -25,7 +25,7 @@
# include "getopt.h"
# endif
#endif
-#include "Mapi.h"
+#include "mapilib/Mapi.h"
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
Index: MapiClient.mx
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/MapiClient.mx,v
retrieving revision 1.88
retrieving revision 1.88.2.1
diff -u -d -r1.88 -r1.88.2.1
--- MapiClient.mx 12 Sep 2007 15:55:17 -0000 1.88
+++ MapiClient.mx 2 Oct 2007 11:49:10 -0000 1.88.2.1
@@ -94,7 +94,7 @@
# include "getopt.h"
# endif
#endif
-#include "Mapi.h"
+#include "mapilib/Mapi.h"
#include <unistd.h>
#include <stdlib.h>
#include <ctype.h>
Index: prompt.c
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/prompt.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- prompt.c 16 Jul 2007 21:54:49 -0000 1.2
+++ prompt.c 2 Oct 2007 11:49:18 -0000 1.2.2.1
@@ -18,7 +18,7 @@
#include "clients_config.h"
#include <monet_options.h>
-#include "Mapi.h"
+#include "mapilib/Mapi.h"
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/Makefile.ag,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- Makefile.ag 13 Sep 2007 15:32:46 -0000 1.8
+++ Makefile.ag 2 Oct 2007 11:49:05 -0000 1.8.2.1
@@ -15,7 +15,7 @@
# All Rights Reserved.
MTSAFE
-INCLUDES = $(MONETDB_INCS) -I../mapilib $(READLINE_INCS) $(OPENSSL_INCS)
+INCLUDES = $(MONETDB_INCS) -I.. $(READLINE_INCS) $(OPENSSL_INCS)
MAPI_LIBS = $(SOCKET_LIBS) $(OPENSSL_LIBS)
Index: dump.c
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/dump.c,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- dump.c 14 Aug 2007 08:17:27 -0000 1.13
+++ dump.c 2 Oct 2007 11:49:15 -0000 1.13.2.1
@@ -18,7 +18,7 @@
#include "clients_config.h"
#include <monet_options.h>
-#include "Mapi.h"
+#include "mapilib/Mapi.h"
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-------------------------------------------------------------------------
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
