Changeset: 9c4ba2daeeb7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c4ba2daeeb7
Modified Files:
gdk/gdk.mx
gdk/gdk_atoms.mx
Branch: Aug2011
Log Message:
Get rid of C++ stuff.
It is unlikely that these files will be included by a C++ program.
diffs (68 lines):
diff --git a/gdk/gdk.mx b/gdk/gdk.mx
--- a/gdk/gdk.mx
+++ b/gdk/gdk.mx
@@ -401,10 +401,6 @@
#endif
#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include "gdk_system.h"
#include "gdk_posix.h"
#include <stream.h>
@@ -2621,9 +2617,6 @@
#define THRset_errbuf(t,b) (t->data[2] = b)
#ifndef GDK_NOLINK
-#ifdef __cplusplus
-extern "C" {
-#endif
static inline bat
BBPcheck(register bat x, register const char *y)
@@ -2680,9 +2673,6 @@
return BBP_cache(-b->batCacheid);
}
-#ifdef __cplusplus
-}
-#endif
#endif
/*
@@ -3422,10 +3412,6 @@
typedef void (*ColFcn) (ptr, ptr);
typedef void (*RowFcn) (ptr, ptr *);
-
-#ifdef __cplusplus
-}
-#endif
@
@h
diff --git a/gdk/gdk_atoms.mx b/gdk/gdk_atoms.mx
--- a/gdk/gdk_atoms.mx
+++ b/gdk/gdk_atoms.mx
@@ -89,9 +89,6 @@
This leads to the following type descriptor table.
@h
-#ifdef __cplusplus
-extern "C" {
-#endif
gdk_export int lngFromStr(str src, int *len, lng **dst);
gdk_export int lngToStr(str *dst, int *len, lng *src);
gdk_export int intFromStr(str src, int *len, int **dst);
@@ -122,9 +119,6 @@
gdk_export int strNil(const char *s);
gdk_export int escapedStrlen(const char *src);
gdk_export int escapedStr(char *dst, const char *src, int dstlen);
-#ifdef __cplusplus
-}
-#endif
@- inline comparison routines
Return 0 on l==r, < 0 iff l < r, >0 iff l > r
@c
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
