Update of /cvsroot/monetdb/pathfinder/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13065/NT
Modified Files:
pf_config.h.in rules.msc
Log Message:
Change MONET4/5 conditionals to HAVE_MONETDB4/5 for consistency with sql.
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/rules.msc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- rules.msc 14 Mar 2007 20:40:42 -0000 1.12
+++ rules.msc 1 Jun 2007 13:20:48 -0000 1.13
@@ -59,7 +59,7 @@
!ENDIF
!IFDEF HAVE_MONETDB4
-MONET4=1
+HAVE_MONETDB4=1
MONETDB4_INCLUDEDIR=$(MONETDB4_PREFIX)\include
MONETDB4_INCS="-I$(MONETDB4_INCLUDEDIR)" "-I$(MONETDB4_INCLUDEDIR)\monet"
"-I$(MONETDB4_INCLUDEDIR)\plain" "-I$(MONETDB4_INCLUDEDIR)\contrib"
"-I$(MONETDB4_INCLUDEDIR)\mapi"
!IF [$(MAKE) /help 2>&1 | grep -q 6.]
@@ -74,7 +74,7 @@
!ENDIF
!IFDEF HAVE_MONETDB5
-MONET5=1
+HAVE_MONETDB5=1
MONETDB5_INCLUDEDIR=$(MONETDB5_PREFIX)\include
MONETDB5_INCS="-I$(MONETDB5_INCLUDEDIR)" "-I$(MONETDB5_INCLUDEDIR)\atoms"
"-I$(MONETDB5_INCLUDEDIR)\compiler" "-I$(MONETDB5_INCLUDEDIR)\kernel"
"-I$(MONETDB5_INCLUDEDIR)\mal" "-I$(MONETDB5_INCLUDEDIR)\mil"
"-I$(MONETDB5_INCLUDEDIR)\optimizer" "-I$(MONETDB5_INCLUDEDIR)\scheduler"
!IF [$(MAKE) /help 2>&1 | grep -q 6.]
Index: pf_config.h.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/pf_config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pf_config.h.in 22 Mar 2007 09:39:04 -0000 1.4
+++ pf_config.h.in 1 Jun 2007 13:20:48 -0000 1.5
@@ -775,6 +775,6 @@
typedef unsigned char uint8_t;
#define MILPRINT_SUMMER_IS_DEFAULT 1
-#define MONET4 1
+#define HAVE_MONETDB4 1
#define HAVE_SOCKLEN_T 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
