MonetDB: default - Merge with Aug2011 branch.

[Stefan Manegold]

Changeset: 56ac5087c846 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56ac5087c846
Modified Files:
        monetdb5/mal/mal.c
        monetdb5/mal/mal_linker.c
Branch: default
Log Message:

Merge with Aug2011 branch.


diffs (61 lines):

diff --git a/de-bootstrap b/de-bootstrap
--- a/de-bootstrap
+++ b/de-bootstrap
@@ -70,4 +70,4 @@
        exit 1
 fi
 
-RM -rf `hg purge --all -p 
-I{\*\*Makefile.\*,\*\*.pyc,aclocal.m4,acout.in,autom4te.cache,buildtools/conf/{config.{guess,sub},install-sh,ltmain.sh,l[ti]\*.m4,missing,ylwrap},configure{,.ac},{doc,install}.lst,monetdb_config.h.in}`
+RM -rf `hg --config extensions.purge= purge --all -p 
-I{\*\*Makefile.\*,\*\*.pyc,aclocal.m4,acout.in,autom4te.cache,buildtools/conf/{config.{guess,sub},install-sh,ltmain.sh,l[ti]\*.m4,missing,ylwrap},configure{,.ac},{doc,install}.lst,monetdb_config.h.in}`
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -180,6 +180,7 @@
 str *monet_script;
 int monet_daemon=0;
 size_t monet_memory;
+#include "mal_stack.h"
 #include "mal_linker.h"
 #include "mal_session.h"
 #include "mal_parser.h"
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -65,6 +65,7 @@
  *
  */
 #include "monetdb_config.h"
+#include "mal_module.h"
 #include "mal_linker.h"
 #include "mal_function.h"      /* for throw() */
 #include "mal_import.h"                /* for slash_2_dir_sep() */
diff --git a/monetdb5/mal/mal_linker.h b/monetdb5/mal/mal_linker.h
--- a/monetdb5/mal/mal_linker.h
+++ b/monetdb5/mal/mal_linker.h
@@ -18,7 +18,7 @@
  */
 
 #ifndef _MAL_LINKER_H
-#include "mal_module.h"
+#define _MAL_LINKER_H
 
 #define MAL_EXT ".mal"
 #define SQL_EXT ".sql"
@@ -42,4 +42,4 @@
 mal_export void initLibraries(void);
 mal_export int isPreloaded(str nme);
 mal_export int isLoaded(str modulename);
-#endif
+#endif /* _MAL_LINKER_H */
diff --git a/monetdb5/mal/mal_xml.h b/monetdb5/mal/mal_xml.h
--- a/monetdb5/mal/mal_xml.h
+++ b/monetdb5/mal/mal_xml.h
@@ -18,6 +18,8 @@
  */
 
 #ifndef _MAL_XML_H
+#define _MAL_XML_H
+
 #include "mal.h"
 
 mal_export char *xmlChr(str s);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list