Changeset: 0eee526be338 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0eee526be338
Modified Files:
clients/examples/C/testcondvar.c
common/utils/matomic.h
gdk/gdk_calc_private.h
gdk/gdk_cand.c
gdk/gdk_group.c
gdk/gdk_posix.h
gdk/gdk_string.c
gdk/gdk_tracer.c
geom/monetdb5/geom.c
monetdb5/extras/rapi/rapi.c
sql/backends/monet5/sql.c
sql/storage/bat/bat_storage.c
sql/storage/objlist.c
unistd.h.in
Branch: default
Log Message:
Remove some superfluous includes.
diffs (160 lines):
diff --git a/clients/examples/C/testcondvar.c b/clients/examples/C/testcondvar.c
--- a/clients/examples/C/testcondvar.c
+++ b/clients/examples/C/testcondvar.c
@@ -12,7 +12,6 @@
#include "monetdb_config.h"
#include "gdk.h"
-#include "gdk_system.h"
#define NN (3)
diff --git a/common/utils/matomic.h b/common/utils/matomic.h
--- a/common/utils/matomic.h
+++ b/common/utils/matomic.h
@@ -87,7 +87,7 @@ typedef unsigned long ATOMIC_BASE_TYPE;
#error "we need a 64 bit atomic type"
#endif
-#else
+#else /* not C++ */
#include <stdatomic.h>
diff --git a/gdk/gdk_calc_private.h b/gdk/gdk_calc_private.h
--- a/gdk/gdk_calc_private.h
+++ b/gdk/gdk_calc_private.h
@@ -33,8 +33,6 @@
#define GT(a, b) ((bit) ((a) > (b)))
-#include "gdk_cand.h"
-
#ifdef __has_builtin
#if __has_builtin(__builtin_add_overflow)
#define OP_WITH_CHECK(lft, rgt, dst, op, max, on_overflow) \
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -13,7 +13,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_cand.h"
bool
BATiscand(BAT *b)
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -13,7 +13,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_cand.h"
/* how much to extend the extent and histo bats when we run out of space */
#define GROUPBATINCR 8192
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -30,8 +30,6 @@
#endif
#endif
-#include "gdk_system.h" /* gdk_export */
-
#ifdef NATIVE_WIN32
#include <io.h>
#include <direct.h>
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -13,7 +13,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_cand.h"
/* String Atom Implementation
*
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -12,7 +12,6 @@
#include "monetdb_config.h"
#include "gdk.h"
-#include "gdk_tracer.h"
#include "gdk_private.h"
#include "mutils.h"
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -18,7 +18,6 @@
#include "geom.h"
#include "geod.h"
#include "geom_atoms.h"
-#include "gdk_logger.h"
#include "mal_exception.h"
mbr mbrNIL = {0}; // will be initialized properly by geom prelude
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -18,7 +18,6 @@
#include "mal.h"
#include "mal_stack.h"
#include "mal_linker.h"
-#include "gdk_utils.h"
#include "gdk.h"
#include "sql_catalog.h"
#include "sql_execute.h"
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -45,7 +45,6 @@
#include "mal_instruction.h"
#include "mal_resource.h"
#include "mal_authorize.h"
-#include "gdk_cand.h"
static inline void
BBPnreclaim(int nargs, ...)
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -14,8 +14,6 @@
#include "bat_storage.h"
#include "bat_utils.h"
#include "sql_string.h"
-#include "gdk_atoms.h"
-#include "gdk_atoms.h"
#include "matomic.h"
#define FATAL_MERGE_FAILURE "Out Of Memory during critical merge operation: %s"
diff --git a/sql/storage/objlist.c b/sql/storage/objlist.c
--- a/sql/storage/objlist.c
+++ b/sql/storage/objlist.c
@@ -14,8 +14,6 @@
#include "sql_catalog.h"
#include "sql_storage.h"
-#include "gdk_atoms.h"
-
static inline int
node_key( node *n )
{
diff --git a/unistd.h.in b/unistd.h.in
--- a/unistd.h.in
+++ b/unistd.h.in
@@ -12,7 +12,7 @@
#ifndef UNISTD_H
#define UNISTD_H
-#include "io.h"
+#include <io.h>
#ifndef __cplusplus
#define open _open
#define read _read
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
