Update of /cvsroot/monetdb/pathfinder/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26436/NT
Modified Files:
Tag: XQuery_0-18
pf_config.h.in rules.msc
Log Message:
Compile with HAE_PFTIJAH on Windows.
Fixes to get it to compile:
- don't include getopt.h and strings.h (they don't exist on Windows,
and they weren't actually needed)
- don't use the type str in file included by fled-generated code: it
uses ptr as a variable name, and ptr is declared as a type in the same
include file str is declared (so we also make sure gdk.h is not
included there)
Also, updated to newer libxml2 library.
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/rules.msc,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -u -d -r1.13.2.4 -r1.13.2.5
--- rules.msc 13 Jun 2007 18:03:57 -0000 1.13.2.4
+++ rules.msc 15 Jun 2007 08:17:11 -0000 1.13.2.5
@@ -25,11 +25,11 @@
BURG="$(TOPDIR)\..\..\buildtools\burg\burg.exe"
# This is the location of libxml2 and its dependencies (depends how it was
compiled; sometimes iconv and zlib are needed)
-LIBXML2 = C:\libxml2-2.6.27.win32
-LIBICONV = C:\iconv-1.9.2.win32
+LIBXML2 = C:\libxml2-2.6.28.win32
+LIBICONV =
LIBZLIB = C:\zlib-1.2.3.win32
-LIBXML2_CFLAGS = "-I$(LIBXML2)\include" "-I$(LIBICONV)\include"
"-I$(LIBZLIB)\include"
-LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2.lib" "$(LIBICONV)\lib\iconv.lib"
"$(LIBZLIB)\lib\zlib.lib"
+LIBXML2_CFLAGS = "-I$(LIBXML2)\include" "-I$(LIBZLIB)\include"
+LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2.lib" "$(LIBZLIB)\lib\zdll.lib"
# override value from global rules.msc
LIBC_INCS = $(PTHREAD_INCS) $(LIBXML_INCS)
@@ -87,3 +87,6 @@
!ELSE
MONETDB5_INCS=
!ENDIF
+
+# also see pf_config.h.in
+HAVE_PFTIJAH=yes
Index: pf_config.h.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/pf_config.h.in,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- pf_config.h.in 8 Jun 2007 11:38:37 -0000 1.5.2.1
+++ pf_config.h.in 15 Jun 2007 08:17:10 -0000 1.5.2.2
@@ -50,3 +50,6 @@
#define MILPRINT_SUMMER_IS_DEFAULT 1
#define HAVE_MONETDB4 1
+
+/* also see rules.msc */
+#define HAVE_PFTIJAH 1
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
