Changeset: 009a0f2beb40 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/009a0f2beb40
Modified Files:
gdk/gdk.h
gdk/gdk_cross.c
gdk/gdk_system.c
gdk/gdk_system.h
Branch: default
Log Message:
gdk.h include gdk_system.h, so no need to include the latter.
diffs (62 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -331,6 +331,16 @@
#include <limits.h> /* for *_MIN and *_MAX */
#include <float.h> /* for FLT_MAX and DBL_MAX */
+#ifdef WIN32
+#ifndef LIBGDK
+#define gdk_export extern __declspec(dllimport)
+#else
+#define gdk_export extern __declspec(dllexport)
+#endif
+#else
+#define gdk_export extern
+#endif
+
typedef enum { GDK_FAIL, GDK_SUCCEED } gdk_return;
#include "gdk_system.h"
diff --git a/gdk/gdk_cross.c b/gdk/gdk_cross.c
--- a/gdk/gdk_cross.c
+++ b/gdk/gdk_cross.c
@@ -9,7 +9,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_system.h"
/* Calculate a cross product between bats l and r with optional
* candidate lists sl for l and sr for r.
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -31,7 +31,6 @@
#include "monetdb_config.h"
#include "mstring.h"
#include "gdk.h"
-#include "gdk_system.h"
#include "gdk_system_private.h"
#include <time.h>
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -9,16 +9,6 @@
#ifndef _GDK_SYSTEM_H_
#define _GDK_SYSTEM_H_
-#ifdef WIN32
-#ifndef LIBGDK
-#define gdk_export extern __declspec(dllimport)
-#else
-#define gdk_export extern __declspec(dllexport)
-#endif
-#else
-#define gdk_export extern
-#endif
-
/* if __has_attribute is not known to the preprocessor, we ignore
* attributes completely; if it is known, use it to find out whether
* specific attributes that we use are known */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
