Changeset: bbd809690e47 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bbd809690e47
Modified Files:
NT/rules.msc
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/xml.c
Branch: embedded
Log Message:
merge
diffs (61 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -144,12 +144,14 @@ BZ_LIBS = "$(LIBBZIP2)\lib\libbz2$(DEBUG
BZ_CFLAGS = -DHAVE_LIBBZ2 "-I$(LIBBZIP2)\include"
!ENDIF
+!IFDEF HAVE_LIBXML
# This is the location of the libxml2 library
!IFNDEF LIBXML2
LIBXML2 = C:\libxml2-2.6.30.win$(bits)
!ENDIF
-libxml2_CFLAGS = "-I$(LIBXML2)\include" $(zlib_CFLAGS) $(ICONV_CFLAGS)
+libxml2_CFLAGS = -DHAVE_LIBXML "-I$(LIBXML2)\include" $(zlib_CFLAGS)
$(ICONV_CFLAGS)
libxml2_LIBS = "$(LIBXML2)\lib\libxml2$(DEBUGLIB).lib" $(zlib_LIBS)
$(ICONV_LIBS)
+!ENDIF
!IFNDEF LIBGEOS
LIBGEOS = C:\geos-3.0.win$(bits)
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -28,7 +28,7 @@
#include <gdk.h>
#include "ctype.h"
#include <string.h>
-#if defined(HAVE_LIBXML) && !defined(HAVE_EMBEDDED)
+#ifdef HAVE_LIBXML
#include <libxml/parser.h>
#endif
#include "mal_interpreter.h"
@@ -62,7 +62,7 @@ batxml_export str BATXMLgroup(xml *ret,
batxml_export str AGGRsubxmlcand(bat *retval, const bat *bid, const bat *gid,
const bat *eid, const bat *sid, const bit *skip_nils);
batxml_export str AGGRsubxml(bat *retval, const bat *bid, const bat *gid,
const bat *eid, const bit *skip_nils);
-#if defined(HAVE_LIBXML) && !defined(HAVE_EMBEDDED)
+#ifdef HAVE_LIBXML
#define prepareResult(X,Y,tpe,Z,free)
\
do {
\
diff --git a/monetdb5/modules/atoms/xml.c b/monetdb5/modules/atoms/xml.c
--- a/monetdb5/modules/atoms/xml.c
+++ b/monetdb5/modules/atoms/xml.c
@@ -17,7 +17,7 @@
#include "monetdb_config.h"
#include "xml.h"
#include "mal_interpreter.h"
-#if defined(HAVE_LIBXML) && !defined(HAVE_EMBEDDED)
+#ifdef HAVE_LIBXML
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#endif
@@ -29,7 +29,7 @@
* A - XML name/attribute pair.
*/
-#if defined(HAVE_LIBXML) && !defined(HAVE_EMBEDDED)
+#ifdef HAVE_LIBXML
size_t
XMLquotestring(const char *s, char *buf, size_t len)
{
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
