Changeset: 7d0bd3c191aa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d0bd3c191aa Modified Files: sql/backends/monet5/datacell/petrinet.c Branch: default Log Message:
Merge with Aug2011 branch. diffs (278 lines): diff --git a/clients/odbc/driver/SQLBrowseConnect.c b/clients/odbc/driver/SQLBrowseConnect.c --- a/clients/odbc/driver/SQLBrowseConnect.c +++ b/clients/odbc/driver/SQLBrowseConnect.c @@ -36,7 +36,6 @@ * **********************************************************************/ -#include <monetdb_config.h> #include "ODBCGlobal.h" #include "ODBCDbc.h" #include "ODBCUtil.h" diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c --- a/clients/odbc/driver/SQLConnect.c +++ b/clients/odbc/driver/SQLConnect.c @@ -36,11 +36,10 @@ * **********************************************************************/ -#include <monetdb_config.h> -#include <monet_options.h> #include "ODBCGlobal.h" #include "ODBCDbc.h" #include "ODBCUtil.h" +#include <monet_options.h> #ifdef HAVE_STRINGS_H #include <strings.h> #endif diff --git a/clients/odbc/setup/drvcfg.c b/clients/odbc/setup/drvcfg.c --- a/clients/odbc/setup/drvcfg.c +++ b/clients/odbc/setup/drvcfg.c @@ -28,6 +28,9 @@ * ----------------------------------------------- * Peter Harvey - [email protected] **************************************************/ + +#include "monetdb_config.h" + #include <drvcfg.h> #include <string.h> /* for memset(), memcpy(), strncpy() */ diff --git a/clients/odbc/setup/drvcfg.h b/clients/odbc/setup/drvcfg.h --- a/clients/odbc/setup/drvcfg.h +++ b/clients/odbc/setup/drvcfg.h @@ -31,8 +31,6 @@ #ifndef _ODBCINST_H #define _ODBCINST_H -#include "monetdb_config.h" - #include <unistd.h> #ifdef HAVE_PWD_H #include <pwd.h> diff --git a/sql/backends/monet5/UDF/udf.c b/sql/backends/monet5/UDF/udf.c --- a/sql/backends/monet5/UDF/udf.c +++ b/sql/backends/monet5/UDF/udf.c @@ -18,6 +18,7 @@ */ +#include "monetdb_config.h" #include "udf.h" static str diff --git a/sql/backends/monet5/UDF/udf.h b/sql/backends/monet5/UDF/udf.h --- a/sql/backends/monet5/UDF/udf.h +++ b/sql/backends/monet5/UDF/udf.h @@ -19,7 +19,6 @@ #ifndef _SQL_UDF_H_ #define _SQL_UDF_H_ -#include "monetdb_config.h" #include "sql.h" #include <string.h> diff --git a/sql/backends/monet5/datacell/basket.c b/sql/backends/monet5/datacell/basket.c --- a/sql/backends/monet5/datacell/basket.c +++ b/sql/backends/monet5/datacell/basket.c @@ -26,6 +26,8 @@ * processing is ignored. * */ + +#include "monetdb_config.h" #include "basket.h" #ifdef WIN32 #include "winsock2.h" diff --git a/sql/backends/monet5/datacell/basket.h b/sql/backends/monet5/datacell/basket.h --- a/sql/backends/monet5/datacell/basket.h +++ b/sql/backends/monet5/datacell/basket.h @@ -20,7 +20,6 @@ #ifndef _BASKETS_ #define _BASKETS_ -#include "monetdb_config.h" #include "mal.h" #include "mal_interpreter.h" #include "sql.h" diff --git a/sql/backends/monet5/datacell/datacell.c b/sql/backends/monet5/datacell/datacell.c --- a/sql/backends/monet5/datacell/datacell.c +++ b/sql/backends/monet5/datacell/datacell.c @@ -22,6 +22,8 @@ * The interface from SQL passes through here. * */ + +#include "monetdb_config.h" #include "datacell.h" #include "opt_datacell.h" #include "sql_optimizer.h" diff --git a/sql/backends/monet5/datacell/datacell.h b/sql/backends/monet5/datacell/datacell.h --- a/sql/backends/monet5/datacell/datacell.h +++ b/sql/backends/monet5/datacell/datacell.h @@ -20,7 +20,6 @@ #ifndef _DATACELLS_ #define _DATACELLS_ -#include "monetdb_config.h" #include "mal.h" #include "mal_interpreter.h" #include "sql.h" diff --git a/sql/backends/monet5/datacell/dcoperator.c b/sql/backends/monet5/datacell/dcoperator.c --- a/sql/backends/monet5/datacell/dcoperator.c +++ b/sql/backends/monet5/datacell/dcoperator.c @@ -27,6 +27,8 @@ * -see test directory * @end example */ + +#include "monetdb_config.h" #include "dcoperator.h" #include "mal_builder.h" diff --git a/sql/backends/monet5/datacell/dcoperator.h b/sql/backends/monet5/datacell/dcoperator.h --- a/sql/backends/monet5/datacell/dcoperator.h +++ b/sql/backends/monet5/datacell/dcoperator.h @@ -23,7 +23,6 @@ */ #ifndef _DCOPERATOR_ #define _DCOPERATOR_ -#include "monetdb_config.h" #include "mal_interpreter.h" #include "basket.h" #include "algebra.h" diff --git a/sql/backends/monet5/datacell/dcsocket.c b/sql/backends/monet5/datacell/dcsocket.c --- a/sql/backends/monet5/datacell/dcsocket.c +++ b/sql/backends/monet5/datacell/dcsocket.c @@ -28,6 +28,8 @@ * @+ Implementation * The implementation is inspired by the tablet module. */ + +#include "monetdb_config.h" #include "dcsocket.h" str diff --git a/sql/backends/monet5/datacell/dcsocket.h b/sql/backends/monet5/datacell/dcsocket.h --- a/sql/backends/monet5/datacell/dcsocket.h +++ b/sql/backends/monet5/datacell/dcsocket.h @@ -19,7 +19,6 @@ #ifndef _DCSOCKET_ #define _DCSOCKET_ -#include "monetdb_config.h" #ifdef WIN32 #include <winsock.h> #else diff --git a/sql/backends/monet5/datacell/emitter.c b/sql/backends/monet5/datacell/emitter.c --- a/sql/backends/monet5/datacell/emitter.c +++ b/sql/backends/monet5/datacell/emitter.c @@ -38,6 +38,8 @@ * baskets. * */ + +#include "monetdb_config.h" #include "emitter.h" #include "batcalc.h" #include "dcsocket.h" diff --git a/sql/backends/monet5/datacell/emitter.h b/sql/backends/monet5/datacell/emitter.h --- a/sql/backends/monet5/datacell/emitter.h +++ b/sql/backends/monet5/datacell/emitter.h @@ -24,7 +24,6 @@ */ #ifndef _EMITTER_ #define _EMITTER_ -#include "monetdb_config.h" #include "mal_interpreter.h" #include "tablet.h" #include "mtime.h" diff --git a/sql/backends/monet5/datacell/petrinet.c b/sql/backends/monet5/datacell/petrinet.c --- a/sql/backends/monet5/datacell/petrinet.c +++ b/sql/backends/monet5/datacell/petrinet.c @@ -71,6 +71,8 @@ Some general statistics about number of events handled per transition is maintained, as well as the processing time for each continous query step. This provides the information to re-design the event handling system. */ + +#include "monetdb_config.h" #include "petrinet.h" #include "mal_builder.h" diff --git a/sql/backends/monet5/datacell/petrinet.h b/sql/backends/monet5/datacell/petrinet.h --- a/sql/backends/monet5/datacell/petrinet.h +++ b/sql/backends/monet5/datacell/petrinet.h @@ -23,7 +23,6 @@ */ #ifndef _PETRINET_ #define _PETRINET_ -#include "monetdb_config.h" #include "mal_interpreter.h" #include "sql_scenario.h" #include "basket.h" diff --git a/sql/backends/monet5/datacell/receptor.c b/sql/backends/monet5/datacell/receptor.c --- a/sql/backends/monet5/datacell/receptor.c +++ b/sql/backends/monet5/datacell/receptor.c @@ -43,6 +43,7 @@ * module to parse them. */ +#include "monetdb_config.h" #include "receptor.h" #include "dcsocket.h" #include "stream_socket.h" diff --git a/sql/backends/monet5/datacell/receptor.h b/sql/backends/monet5/datacell/receptor.h --- a/sql/backends/monet5/datacell/receptor.h +++ b/sql/backends/monet5/datacell/receptor.h @@ -24,7 +24,6 @@ */ #ifndef _RECEPTOR_ #define _RECEPTOR_ -#include "monetdb_config.h" #include "mal_interpreter.h" #include "tablet.h" #include "mtime.h" diff --git a/tools/merovingian/daemon/discoveryrunner.h b/tools/merovingian/daemon/discoveryrunner.h --- a/tools/merovingian/daemon/discoveryrunner.h +++ b/tools/merovingian/daemon/discoveryrunner.h @@ -20,7 +20,6 @@ #ifndef _DISCOVERYRUNNER_H #define _DISCOVERYRUNNER_H 1 -#include "monetdb_config.h" #include <pthread.h> #include <msabaoth.h> diff --git a/tools/merovingian/daemon/forkmserver.h b/tools/merovingian/daemon/forkmserver.h --- a/tools/merovingian/daemon/forkmserver.h +++ b/tools/merovingian/daemon/forkmserver.h @@ -20,7 +20,6 @@ #ifndef _FORKMSERVER_H #define _FORKMSERVER_H 1 -#include "monetdb_config.h" #include <msabaoth.h> /* sabdb */ #include "merovingian.h" /* err */ diff --git a/tools/merovingian/daemon/merovingian.h b/tools/merovingian/daemon/merovingian.h --- a/tools/merovingian/daemon/merovingian.h +++ b/tools/merovingian/daemon/merovingian.h @@ -20,7 +20,6 @@ #ifndef _MEROVINGIAN_H #define _MEROVINGIAN_H 1 -#include "monetdb_config.h" #include <stdio.h> #include <netinet/in.h> /* struct sockaddr_in */ #include <pthread.h> /* pthread_mutex_t */ diff --git a/tools/merovingian/utils/glob.c b/tools/merovingian/utils/glob.c --- a/tools/merovingian/utils/glob.c +++ b/tools/merovingian/utils/glob.c @@ -25,6 +25,7 @@ * - * expands to an arbitrary string */ +#include "monetdb_config.h" #include <stdlib.h> /* NULL */ #include "glob.h" _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
