Changeset: e79fcff113ef for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e79fcff113ef
Modified Files:
.clang-format
geom/lib/libgeom.h
geom/monetdb5/geom.h
Branch: default
Log Message:
No need for (lib)geom_export.
diffs (104 lines):
diff --git a/.clang-format b/.clang-format
--- a/.clang-format
+++ b/.clang-format
@@ -83,8 +83,6 @@ StatementAttributeLikeMacros:
- fits_export
- gdk_export
- generator_export
- - geom_export
- - libgeom_export
- mal_export
- mapi_export
- monetdbe_export
diff --git a/geom/lib/libgeom.h b/geom/lib/libgeom.h
--- a/geom/lib/libgeom.h
+++ b/geom/lib/libgeom.h
@@ -18,16 +18,6 @@
* The geom library is based on the geos (Geometry Engine Open Source) library.
*/
-#ifdef WIN32
-#ifndef LIBGEOM
-#define libgeom_export extern __declspec(dllimport)
-#else
-#define libgeom_export extern __declspec(dllexport)
-#endif
-#else
-#define libgeom_export extern
-#endif
-
#define GEOS_USE_ONLY_R_API 1
#include <geos_c.h>
#ifdef HAVE_PROJ
@@ -96,7 +86,7 @@ Type values:
*/
-libgeom_export GEOSContextHandle_t libgeom_tls(void);
+extern GEOSContextHandle_t libgeom_tls(void);
#define geoshandle (libgeom_tls())
typedef enum wkb_type {
@@ -112,7 +102,7 @@ typedef enum wkb_type {
wkbGeometryCollection_mdb = 8
} wkb_type;
-libgeom_export const char *geom_type2str(int t, int flag);
+extern const char *geom_type2str(int t, int flag);
typedef struct wkb {
int len;
@@ -127,11 +117,11 @@ typedef struct {
wkb wkb;
} geom_geometry;
-libgeom_export gdk_return libgeom_init(void);
+extern gdk_return libgeom_init(void);
#define mbr_nil mbrFromGeos(NULL, NULL);
-libgeom_export bool is_wkb_nil(const wkb *wkbp);
-libgeom_export GEOSGeom wkb2geos(const wkb *geomWKB);
+extern bool is_wkb_nil(const wkb *wkbp);
+extern GEOSGeom wkb2geos(const wkb *geomWKB);
#endif /* LIBGEOM_H */
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -40,7 +40,7 @@ extern str mbrFromMBR(Client ctx, mbr **
__attribute__((__visibility__("hidden")));
extern str wkbFromWKB(Client ctx, wkb **w, wkb **src)
__attribute__((__visibility__("hidden")));
-//Is it needed?? geom_export str wkbFromWKB_bat(bat* outBAT_id, bat* inBAT_id);
+//Is it needed?? extern str wkbFromWKB_bat(bat* outBAT_id, bat* inBAT_id);
/* The WKB we use is the EWKB used also in PostGIS
* because we decided that it is easire to carry around
@@ -84,7 +84,7 @@ extern str wkbAsText_bat(Client ctx, bat
extern str wkbAsBinary(Client ctx, char**, wkb**)
__attribute__((__visibility__("hidden")));
-//geom_export str wkbFromBinary(Client ctx, wkb**, const char**);
+//extern str wkbFromBinary(Client ctx, wkb**, const char**);
extern str wkbFromBinaryWithBuffer(allocator *ma, wkb **geomWKB, size_t *len,
const char **inStr)
__attribute__((__visibility__("hidden")));
@@ -136,7 +136,7 @@ extern str wkbDWithinMbr(Client ctx, bit
//LocateAlong
//LocateBetween
-//geom_export str wkbFromString(wkb**, str*);
+//extern str wkbFromString(wkb**, str*);
extern str wkbMakePoint(Client ctx, wkb**, dbl*, dbl*, dbl*, dbl*, int*)
__attribute__((__visibility__("hidden")));
@@ -297,7 +297,7 @@ extern str wkbContains_geom_bat(Client c
extern str wkbContains_bat_geom(Client ctx, bat* outBAT_id, bat* inBAT_id,
wkb** geomWKB)
__attribute__((__visibility__("hidden")));
-//geom_export str wkbFilter_bat(bat* aBATfiltered_id, bat* bBATfiltered_id,
bat* aBAT_id, bat* bBAT_id);
+//extern str wkbFilter_bat(bat* aBATfiltered_id, bat* bBATfiltered_id, bat*
aBAT_id, bat* bBAT_id);
extern str wkbFilter_geom_bat(Client ctx, bat* BATfiltered_id, wkb** geomWKB,
bat* BAToriginal_id)
__attribute__((__visibility__("hidden")));
extern str wkbFilter_bat_geom(Client ctx, bat* BATfiltered_id, bat*
BAToriginal_id, wkb** geomWKB)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
