Changeset: 12edc905ba87 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12edc905ba87 Modified Files: configure.ag gdk/gdk_system.mx Branch: default Log Message:
Merge with Mar2011 branch. diffs (48 lines): diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -3088,10 +3088,11 @@ dnl add some includes that we want to be there always (by default) dnl this is kind of bad practice, but consider it legacy that would be dnl good to clean up some day -AH_BOTTOM([ +AH_TOP([ #ifndef _SEEN_MONETDB_CONFIG_H #define _SEEN_MONETDB_CONFIG_H 1 - +]) +AH_BOTTOM([ /* AC_FUNC_ALLOCA autoconf documented code */ #ifdef HAVE_ALLOCA_H # include <alloca.h> diff --git a/gdk/gdk_system.mx b/gdk/gdk_system.mx --- a/gdk/gdk_system.mx +++ b/gdk/gdk_system.mx @@ -39,8 +39,6 @@ #ifndef _GDK_SYSTEM_H_ #define _GDK_SYSTEM_H_ -#include "monetdb_config.h" - #ifdef NATIVE_WIN32 #ifndef LIBGDK #define gdk_export extern __declspec(dllimport) diff --git a/sql/backends/monet5/vaults/vault.mx b/sql/backends/monet5/vaults/vault.mx --- a/sql/backends/monet5/vaults/vault.mx +++ b/sql/backends/monet5/vaults/vault.mx @@ -188,7 +188,6 @@ @h #ifndef _VAULT_H #define _VAULT_H -#include "monetdb_config.h" #include "clients.h" #include "mal.h" #include "mal_client.h" @@ -225,6 +224,7 @@ #endif /* _VAULT_H */ @- Module initializaton @c +#include "monetdb_config.h" #include "vault.h" char vaultpath[BUFSIZ]; _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
