Changeset: cf424113d059 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf424113d059
Added Files:
gdk/gdk_system_private.h
Modified Files:
gdk/Makefile.ag
gdk/gdk_private.h
gdk/gdk_system.c
Branch: default
Log Message:
Create separate include file for MT_exit_thread.
gdk_system.c can't include gdk_private.h because it didn't include
gdk.h and hence has no knowledge about the BAT type.
diffs (76 lines):
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -34,7 +34,7 @@ lib_gdk = {
gdk_delta.c gdk_cross.c gdk_system.c gdk_value.c \
gdk_posix.c gdk_logger.c gdk_sample.c \
gdk_private.h gdk_delta.h gdk_logger.h gdk_posix.h \
- gdk_system.h gdk_tm.h gdk_storage.h \
+ gdk_system.h gdk_system_private.h gdk_tm.h gdk_storage.h \
gdk_calc.c gdk_calc.h gdk_calc_compare.h gdk_calc_private.h \
gdk_aggr.c gdk_group.c gdk_mapreduce.c gdk_mapreduce.h \
gdk_imprints.c gdk_imprints.h \
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -23,6 +23,8 @@
#error this file should not be included outside its source directory
#endif
+#include "gdk_system_private.h"
+
/*
* The different parts of which a BAT consists are physically stored
* next to each other in the BATstore type.
@@ -151,8 +153,6 @@ int HEAPwarm(Heap *h)
__attribute__((__visibility__("hidden")));
oid MAXoid(BAT *i)
__attribute__((__visibility__("hidden")));
-__declspec(noreturn) void MT_exit_thread(int status)
- __attribute__((__noreturn__));
void MT_init_posix(void)
__attribute__((__visibility__("hidden")));
void *MT_mremap(const char *path, int mode, void *old_address, size_t
old_size, size_t *new_size)
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -41,6 +41,7 @@
*/
#include "monetdb_config.h"
#include "gdk_system.h"
+#include "gdk_system_private.h"
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
diff --git a/gdk/gdk_system_private.h b/gdk/gdk_system_private.h
new file mode 100644
--- /dev/null
+++ b/gdk/gdk_system_private.h
@@ -0,0 +1,27 @@
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.monetdb.org/Legal/MonetDBLicense
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2014 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+/* This file should not be included in any file outside of this directory */
+
+#ifndef LIBGDK
+#error this file should not be included outside its source directory
+#endif
+
+__declspec(noreturn) void MT_exit_thread(int status)
+ __attribute__((__noreturn__));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
