Changeset: 5adb7d9fbcfa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5adb7d9fbcfa
Modified Files:
gdk/gdk.h
gdk/gdk_atoms.h
Branch: headless
Log Message:
Remove C++ conditionals.
diffs (68 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -402,10 +402,6 @@
#endif
#endif
-/* #ifdef __cplusplus */
-/* extern "C" { */
-/* #endif */
-
#include "gdk_system.h"
#include "gdk_posix.h"
#include <stream.h>
@@ -2612,9 +2608,6 @@
#define THRset_errbuf(t,b) (t->data[2] = b)
#ifndef GDK_NOLINK
-/* #ifdef __cplusplus */
-/* extern "C" { */
-/* #endif */
static inline bat
CBPcheck(register bat x, register const char *y)
@@ -2644,9 +2637,6 @@
return b;
}
-/* #ifdef __cplusplus */
-/* } */
-/* #endif */
#endif
/*
@@ -3308,10 +3298,6 @@
typedef void (*ColFcn) (ptr, ptr);
typedef void (*RowFcn) (ptr, ptr *);
-/* #ifdef __cplusplus */
-/* } */
-/* #endif */
-
#define ILLEGALVALUE ((ptr)-1L)
#define MAXPARAMS 32
diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -80,9 +80,6 @@
* This leads to the following type descriptor table.
*/
-#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);
@@ -115,9 +112,6 @@
gdk_export int escapedStrlen(const char *src);
gdk_export int escapedStr(char *dst, const char *src, int dstlen);
-#ifdef __cplusplus
-}
-#endif
/*
* @- nil values
* All types have a single value designated as a NIL value. It designates
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
