Changeset: 48511fa191e1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48511fa191e1
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/ReadlineTools.c
clients/mapiclient/dump.c
clients/mapiclient/mnc.c
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/mapilib/Makefile.ag
clients/odbc/driver/Makefile.ag
clients/odbc/driver/SQLConnect.c
gdk/gdk_utils.c
gdk/gdk_utils.h
geom/lib/Makefile.ag
geom/monetdb5/Makefile.ag
monetdb5/extras/mal_optimizer_template/Makefile.ag
monetdb5/extras/rapi/Makefile.ag
monetdb5/mal/Makefile.ag
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/mal/Makefile.ag
monetdb5/optimizer/Makefile.ag
monetdb5/scheduler/Makefile.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/UDF/capi/Makefile.ag
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi3/Makefile.ag
sql/backends/monet5/UDF/udf/Makefile.ag
sql/backends/monet5/generator/Makefile.ag
sql/backends/monet5/vaults/bam/Makefile.ag
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/lidar/Makefile.ag
sql/backends/monet5/vaults/netcdf/Makefile.ag
sql/backends/monet5/vaults/shp/Makefile.ag
sql/common/Makefile.ag
sql/server/Makefile.ag
sql/storage/Makefile.ag
sql/storage/bat/Makefile.ag
tools/merovingian/daemon/controlrunner.c
tools/merovingian/utils/Makefile.ag
Branch: default
Log Message:
No need to include monet_options.h everywhere.
diffs (truncated from 452 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -251,7 +251,7 @@ bool GDKgetenv_istrue(const char *name);
bool GDKgetenv_isyes(const char *name);
gdk_return GDKgetsem(int sem_id, int count, int *semid);
gdk_return GDKgetsemval(int sem_id, int number, int *semval);
-gdk_return GDKinit(opt *set, int setlen);
+gdk_return GDKinit(struct opt *set, int setlen);
void *GDKinitmmap(size_t id, size_t size, size_t *return_size);
ATOMIC_TYPE GDKlockcnt;
ATOMIC_TYPE GDKlockcontentioncnt;
diff --git a/clients/mapiclient/ReadlineTools.c
b/clients/mapiclient/ReadlineTools.c
--- a/clients/mapiclient/ReadlineTools.c
+++ b/clients/mapiclient/ReadlineTools.c
@@ -10,7 +10,6 @@
* Readline specific stuff
*/
#include "monetdb_config.h"
-#include "monet_options.h"
#ifdef HAVE_LIBREADLINE
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -7,7 +7,6 @@
*/
#include "monetdb_config.h"
-#include "monet_options.h"
#include "mapi.h"
#include "stream.h"
#include <unistd.h>
diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -16,7 +16,6 @@
*/
#include "monetdb_config.h"
-#include "monet_options.h"
#include "mapi.h"
#include "stream.h"
#include "stream_socket.h"
diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -17,7 +17,6 @@
*/
#include "monetdb_config.h"
-#include "monet_options.h"
#include "stream.h"
#include "stream_socket.h"
#include "mapi.h"
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -13,7 +13,6 @@
*/
#include "monetdb_config.h"
-#include "monet_options.h"
#include "stream.h"
#include "stream_socket.h"
#include "mapi.h"
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -17,7 +17,6 @@
*/
#include "monetdb_config.h"
-#include "monet_options.h"
#include "stream.h"
#include "stream_socket.h"
#include "mapi.h"
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -6,14 +6,13 @@
MTSAFE
-INCLUDES = ../../common/options ../../common/stream ../../common/utils \
+INCLUDES = ../../common/stream ../../common/utils \
$(MSGCONTROL_FLAGS) $(openssl_CFLAGS)
lib_mapi = {
VERSION = $(MAPI_VERSION)
SOURCES = mapi.c mapi.rc
- LIBS = ../../common/options/libmoptions \
- ../../common/utils/libmcrypt \
+ LIBS = ../../common/utils/libmcrypt \
WIN32?../../common/stream/libstream \
WIN32?$(SOCKET_LIBS) \
WIN32?$(openssl_LIBS)
diff --git a/clients/odbc/driver/Makefile.ag b/clients/odbc/driver/Makefile.ag
--- a/clients/odbc/driver/Makefile.ag
+++ b/clients/odbc/driver/Makefile.ag
@@ -6,7 +6,6 @@
INCLUDES = \
../../mapilib \
- ../../../common/options \
$(ODBC_INCS)
DEFS = @DEFS@
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
@@ -28,7 +28,6 @@
#include "ODBCGlobal.h"
#include "ODBCDbc.h"
#include "ODBCUtil.h"
-#include "monet_options.h"
#include <time.h>
#ifdef HAVE_ODBCINST_H
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -15,6 +15,7 @@
* logging scheme.
*/
#include "monetdb_config.h"
+#include "monet_options.h"
#include "gdk.h"
#include "gdk_private.h"
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -9,7 +9,6 @@
#ifndef _GDK_UTILS_H_
#define _GDK_UTILS_H_
-#include "monet_options.h"
#include <setjmp.h>
gdk_export const char *GDKgetenv(const char *name);
@@ -72,7 +71,8 @@ gdk_export size_t _MT_pagesize;
#define MT_npages() _MT_npages
gdk_export void MT_init(void); /* init the package. */
-gdk_export gdk_return GDKinit(opt *set, int setlen);
+struct opt;
+gdk_export gdk_return GDKinit(struct opt *set, int setlen);
/* used for testing only */
gdk_export void GDKsetmallocsuccesscount(lng count);
diff --git a/geom/lib/Makefile.ag b/geom/lib/Makefile.ag
--- a/geom/lib/Makefile.ag
+++ b/geom/lib/Makefile.ag
@@ -5,7 +5,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
MTSAFE
-INCLUDES = ../../common/options ../../common/stream ../../common/utils
../../gdk $(GEOS_INCS) $(proj_CFLAGS)
+INCLUDES = ../../common/stream ../../common/utils ../../gdk $(GEOS_INCS)
$(proj_CFLAGS)
lib_geom = {
NOINST
diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag
--- a/geom/monetdb5/Makefile.ag
+++ b/geom/monetdb5/Makefile.ag
@@ -9,7 +9,6 @@ INCLUDES = ../lib \
../../gdk \
../../common/utils \
../../common/stream \
- ../../common/options \
../../monetdb5/mal \
$(GEOS_INCS) $(proj_CFLAGS)
diff --git a/monetdb5/extras/mal_optimizer_template/Makefile.ag
b/monetdb5/extras/mal_optimizer_template/Makefile.ag
--- a/monetdb5/extras/mal_optimizer_template/Makefile.ag
+++ b/monetdb5/extras/mal_optimizer_template/Makefile.ag
@@ -9,7 +9,6 @@ INCLUDES = \
../../mal \
../../../gdk \
../../../common/stream \
- ../../../common/options \
../../../common/utils
MTSAFE
diff --git a/monetdb5/extras/rapi/Makefile.ag b/monetdb5/extras/rapi/Makefile.ag
--- a/monetdb5/extras/rapi/Makefile.ag
+++ b/monetdb5/extras/rapi/Makefile.ag
@@ -5,7 +5,6 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
INCLUDES = \
- ../../../common/options \
../../../common/stream \
../../../common/utils \
../../../gdk \
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -4,8 +4,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
-INCLUDES = ../../common/options \
- ../../common/stream \
+INCLUDES = ../../common/stream \
../../common/utils \
../../clients/mapilib \
../../gdk \
diff --git a/monetdb5/modules/atoms/Makefile.ag
b/monetdb5/modules/atoms/Makefile.ag
--- a/monetdb5/modules/atoms/Makefile.ag
+++ b/monetdb5/modules/atoms/Makefile.ag
@@ -5,7 +5,6 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
INCLUDES = ../../mal \
- ../../../common/options \
../../../common/stream \
../../../common/utils \
../../../gdk \
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -6,7 +6,6 @@
INCLUDES = ../../mal \
../atoms \
- ../../../common/options \
../../../common/stream \
../../../common/utils \
../../../gdk
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -6,7 +6,6 @@
INCLUDES = ../../mal ../atoms ../kernel \
../../../clients/mapilib \
- ../../../common/options \
../../../common/stream \
../../../common/utils \
../../../gdk \
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -6,7 +6,6 @@
INCLUDES = ../mal ../modules/atoms ../modules/mal ../modules/kernel \
../../clients/mapilib \
- ../../common/options \
../../common/stream \
../../common/utils \
../../gdk
diff --git a/monetdb5/scheduler/Makefile.ag b/monetdb5/scheduler/Makefile.ag
--- a/monetdb5/scheduler/Makefile.ag
+++ b/monetdb5/scheduler/Makefile.ag
@@ -7,7 +7,6 @@
INCLUDES = ../mal ../optimizer \
../modules/atoms ../modules/mal ../modules/kernel \
../../clients/mapilib \
- ../../common/options \
../../common/stream \
../../common/utils \
../../gdk
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -14,7 +14,6 @@ INCLUDES = ../../include ../../common ..
../../../monetdb5/optimizer \
../../../monetdb5/scheduler \
../../../monetdb5/extras/rapi \
- ../../../common/options \
../../../common/stream \
../../../common/utils \
../../../gdk
diff --git a/sql/backends/monet5/UDF/capi/Makefile.ag
b/sql/backends/monet5/UDF/capi/Makefile.ag
--- a/sql/backends/monet5/UDF/capi/Makefile.ag
+++ b/sql/backends/monet5/UDF/capi/Makefile.ag
@@ -6,7 +6,6 @@
INCLUDES = \
../../../../../clients/mapilib \
- ../../../../../common/options \
../../../../../common/utils \
../../../../../common/stream \
../../../../../monetdb5/modules/atoms \
diff --git a/sql/backends/monet5/UDF/pyapi/Makefile.ag
b/sql/backends/monet5/UDF/pyapi/Makefile.ag
--- a/sql/backends/monet5/UDF/pyapi/Makefile.ag
+++ b/sql/backends/monet5/UDF/pyapi/Makefile.ag
@@ -6,7 +6,6 @@
INCLUDES = \
../../../../../clients/mapilib \
- ../../../../../common/options \
../../../../../common/utils \
../../../../../common/stream \
../../../../../monetdb5/modules/atoms \
diff --git a/sql/backends/monet5/UDF/pyapi3/Makefile.ag
b/sql/backends/monet5/UDF/pyapi3/Makefile.ag
--- a/sql/backends/monet5/UDF/pyapi3/Makefile.ag
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
