Changeset: c8817fd21944 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8817fd21944
Modified Files:
MonetDB/src/common/dummy_gdk_utils.mx
Branch: default
Log Message:
merge
diffs (53 lines):
diff -r 593b7ab606ed -r c8817fd21944 MonetDB/src/common/Makefile.ag
--- a/MonetDB/src/common/Makefile.ag Thu Jan 13 21:52:28 2011 +0100
+++ b/MonetDB/src/common/Makefile.ag Thu Jan 13 21:55:36 2011 +0100
@@ -29,8 +29,7 @@
headers_common = {
DIR = includedir/MonetDB/common
HEADERS = h
- SOURCES = monet_options.mx monet_getopt.h \
- dummy_gdk_utils.mx
+ SOURCES = monet_options.mx monet_getopt.h
}
headers_pc = {
diff -r 593b7ab606ed -r c8817fd21944 MonetDB/src/common/dummy_gdk_utils.mx
--- a/MonetDB/src/common/dummy_gdk_utils.mx Thu Jan 13 21:52:28 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-@/
-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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-
-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-2011 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f dummy_gdk_utils
-@h
-#ifndef _GDK_UTILS_H
-#define _GDK_UTILS_H
-
-#ifdef NATIVE_WIN32
-#define dummy_export extern __declspec(dllimport)
-#else
-#define dummy_export extern
-#endif
-
-dummy_export void *GDKmalloc(size_t size);
-dummy_export void *GDKrealloc(void *pold, size_t size);
-dummy_export void GDKfree(void *blk);
-dummy_export char *GDKstrdup(char *s);
-
-#endif /*_GDK_UTILS_H*/
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
