Changeset: f7cca259b065 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f7cca259b065 Modified Files: clients/mapilib/mapi.h clients/mapilib/msettings.h common/options/monet_getopt.h common/options/monet_options.h common/stream/stream.h common/utils/mcrypt.h common/utils/msabaoth.h common/utils/mutils.h gdk/gdk.h geom/lib/libgeom.h geom/monetdb5/geom.h monetdb5/mal/mal.h monetdb5/modules/mal/orderidx.h sql/backends/monet5/UDF/pyapi3/pyheader.h sql/backends/monet5/UDF/udf/udf.h sql/backends/monet5/generator/generator.h sql/backends/monet5/sql.h sql/backends/monet5/sql_import.h sql/backends/monet5/vaults/fits/fits.h sql/backends/monet5/vaults/netcdf/netcdf_vault.h sql/backends/monet5/vaults/shp/shp.h sql/include/sql_mem.h tools/monetdbe/monetdbe.h Branch: default Log Message:
Remove externally_visible attribute. Not recognized by clang on Darwin, and more complicated than it's worth to work around that. diffs (276 lines): diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h --- a/clients/mapilib/mapi.h +++ b/clients/mapilib/mapi.h @@ -66,7 +66,7 @@ extern "C" { #define mapi_export extern __declspec(dllexport) #endif #else -#define mapi_export __attribute__((__externally_visible__)) extern +#define mapi_export extern #endif #ifndef __GNUC__ diff --git a/clients/mapilib/msettings.h b/clients/mapilib/msettings.h --- a/clients/mapilib/msettings.h +++ b/clients/mapilib/msettings.h @@ -33,7 +33,7 @@ extern "C" { #define mapi_export extern __declspec(dllexport) #endif #else -#define mapi_export __attribute__((__externally_visible__)) extern +#define mapi_export extern #endif ///////////////////////////////////////////////////////////////////// diff --git a/common/options/monet_getopt.h b/common/options/monet_getopt.h --- a/common/options/monet_getopt.h +++ b/common/options/monet_getopt.h @@ -51,7 +51,7 @@ extern "C" { #endif #ifndef moptions_export -#define moptions_export __attribute__((__externally_visible__)) extern +#define moptions_export extern #endif /* For communication from `getopt' to the caller. diff --git a/common/options/monet_options.h b/common/options/monet_options.h --- a/common/options/monet_options.h +++ b/common/options/monet_options.h @@ -30,7 +30,7 @@ extern "C" { #endif #ifndef moptions_export -#define moptions_export __attribute__((__externally_visible__)) extern +#define moptions_export extern #endif /* mo_print_options will print the option set on stderr */ diff --git a/common/stream/stream.h b/common/stream/stream.h --- a/common/stream/stream.h +++ b/common/stream/stream.h @@ -46,7 +46,7 @@ # define stream_export extern __declspec(dllexport) # endif #else -# define stream_export __attribute__((__externally_visible__)) extern +# define stream_export extern #endif /* Defines to help the compiler check printf-style format arguments. diff --git a/common/utils/mcrypt.h b/common/utils/mcrypt.h --- a/common/utils/mcrypt.h +++ b/common/utils/mcrypt.h @@ -20,7 +20,7 @@ #define mcrypt_export extern __declspec(dllexport) #endif #else -#define mcrypt_export __attribute__((__externally_visible__)) extern +#define mcrypt_export extern #endif mcrypt_export const char *mcrypt_getHashAlgorithms(void) diff --git a/common/utils/msabaoth.h b/common/utils/msabaoth.h --- a/common/utils/msabaoth.h +++ b/common/utils/msabaoth.h @@ -66,7 +66,7 @@ typedef struct Ssabuplog { #define msab_export extern __declspec(dllexport) #endif #else -#define msab_export __attribute__((__externally_visible__)) extern +#define msab_export extern #endif msab_export void msab_dbpathinit(const char *dbpath); diff --git a/common/utils/mutils.h b/common/utils/mutils.h --- a/common/utils/mutils.h +++ b/common/utils/mutils.h @@ -20,7 +20,7 @@ #define mutils_export extern __declspec(dllexport) #endif #else -#define mutils_export __attribute__((__externally_visible__)) extern +#define mutils_export extern #endif #ifdef NATIVE_WIN32 diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -342,7 +342,7 @@ #define gdk_export extern __declspec(dllexport) #endif #else -#define gdk_export __attribute__((__externally_visible__)) extern +#define gdk_export extern #endif /* Only ever compare with GDK_SUCCEED, never with GDK_FAIL, and do not diff --git a/geom/lib/libgeom.h b/geom/lib/libgeom.h --- a/geom/lib/libgeom.h +++ b/geom/lib/libgeom.h @@ -27,7 +27,7 @@ #define libgeom_export extern __declspec(dllexport) #endif #else -#define libgeom_export __attribute__((__externally_visible__)) extern +#define libgeom_export extern #endif #define GEOS_USE_ONLY_R_API 1 diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h --- a/geom/monetdb5/geom.h +++ b/geom/monetdb5/geom.h @@ -33,7 +33,7 @@ #define geom_export extern __declspec(dllexport) #endif #else -#define geom_export __attribute__((__externally_visible__)) extern +#define geom_export extern #endif wkb * geos2wkb(const GEOSGeometry *geosGeometry); diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h --- a/monetdb5/mal/mal.h +++ b/monetdb5/mal/mal.h @@ -27,7 +27,7 @@ #define mal_export extern __declspec(dllexport) #endif #else -#define mal_export __attribute__((__externally_visible__)) extern +#define mal_export extern #endif #ifdef HAVE_SYS_TIMES_H diff --git a/monetdb5/modules/mal/orderidx.h b/monetdb5/modules/mal/orderidx.h --- a/monetdb5/modules/mal/orderidx.h +++ b/monetdb5/modules/mal/orderidx.h @@ -26,7 +26,7 @@ #define orderidx_export extern __declspec(dllexport) #endif #else -#define orderidx_export __attribute__((__externally_visible__)) extern +#define orderidx_export extern #endif orderidx_export str OIDXcreateImplementation(Client cntxt, int tpe, BAT *b, diff --git a/sql/backends/monet5/UDF/pyapi3/pyheader.h b/sql/backends/monet5/UDF/pyapi3/pyheader.h --- a/sql/backends/monet5/UDF/pyapi3/pyheader.h +++ b/sql/backends/monet5/UDF/pyapi3/pyheader.h @@ -67,7 +67,7 @@ #define pyapi_export extern __declspec(dllexport) #endif #else -#define pyapi_export __attribute__((__externally_visible__)) extern +#define pyapi_export extern #endif PyDateTime_CAPI *get_DateTimeAPI(void); diff --git a/sql/backends/monet5/UDF/udf/udf.h b/sql/backends/monet5/UDF/udf/udf.h --- a/sql/backends/monet5/UDF/udf/udf.h +++ b/sql/backends/monet5/UDF/udf/udf.h @@ -28,7 +28,7 @@ #define udf_export extern __declspec(dllexport) #endif #else -#define udf_export __attribute__((__externally_visible__)) extern +#define udf_export extern #endif /* export MAL wrapper functions */ diff --git a/sql/backends/monet5/generator/generator.h b/sql/backends/monet5/generator/generator.h --- a/sql/backends/monet5/generator/generator.h +++ b/sql/backends/monet5/generator/generator.h @@ -25,7 +25,7 @@ #define generator_export extern __declspec(dllexport) #endif #else -#define generator_export __attribute__((__externally_visible__)) extern +#define generator_export extern #endif generator_export str VLTgenerator_noop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); diff --git a/sql/backends/monet5/sql.h b/sql/backends/monet5/sql.h --- a/sql/backends/monet5/sql.h +++ b/sql/backends/monet5/sql.h @@ -28,7 +28,7 @@ #define sql5_export extern __declspec(dllexport) #endif #else -#define sql5_export __attribute__((__externally_visible__)) extern +#define sql5_export extern #endif #include "mal_backend.h" diff --git a/sql/backends/monet5/sql_import.h b/sql/backends/monet5/sql_import.h --- a/sql/backends/monet5/sql_import.h +++ b/sql/backends/monet5/sql_import.h @@ -20,7 +20,7 @@ #define sql_export extern __declspec(dllimport) #endif #else -#define sql_export __attribute__((__externally_visible__)) extern +#define sql_export extern #endif sql_export void sql_register(const char *name, const unsigned char *code); diff --git a/sql/backends/monet5/vaults/fits/fits.h b/sql/backends/monet5/vaults/fits/fits.h --- a/sql/backends/monet5/vaults/fits/fits.h +++ b/sql/backends/monet5/vaults/fits/fits.h @@ -22,7 +22,7 @@ #define fits_export extern __declspec(dllexport) #endif #else -#define fits_export __attribute__((__externally_visible__)) extern +#define fits_export extern #endif fits_export str FITStest(int *res, str *fname); diff --git a/sql/backends/monet5/vaults/netcdf/netcdf_vault.h b/sql/backends/monet5/vaults/netcdf/netcdf_vault.h --- a/sql/backends/monet5/vaults/netcdf/netcdf_vault.h +++ b/sql/backends/monet5/vaults/netcdf/netcdf_vault.h @@ -22,7 +22,7 @@ #define netcdf_export extern __declspec(dllexport) #endif #else -#define netcdf_export __attribute__((__externally_visible__)) extern +#define netcdf_export extern #endif netcdf_export str NCDFtest(int *vars, str *fname); diff --git a/sql/backends/monet5/vaults/shp/shp.h b/sql/backends/monet5/vaults/shp/shp.h --- a/sql/backends/monet5/vaults/shp/shp.h +++ b/sql/backends/monet5/vaults/shp/shp.h @@ -80,7 +80,7 @@ void GDALWClose(GDALWConnection *); #define shp_export extern __declspec(dllexport) #endif #else -#define shp_export __attribute__((__externally_visible__)) extern +#define shp_export extern #endif str createSHPtable(Client cntxt, str schemaname, str tablename, GDALWConnection shp_conn, GDALWSimpleFieldDef *field_definitions); diff --git a/sql/include/sql_mem.h b/sql/include/sql_mem.h --- a/sql/include/sql_mem.h +++ b/sql/include/sql_mem.h @@ -26,7 +26,7 @@ #define sql_export extern __declspec(dllimport) #endif #else -#define sql_export __attribute__((__externally_visible__)) extern +#define sql_export extern #endif #define MNEW( type ) (type*)GDKmalloc(sizeof(type) ) diff --git a/tools/monetdbe/monetdbe.h b/tools/monetdbe/monetdbe.h --- a/tools/monetdbe/monetdbe.h +++ b/tools/monetdbe/monetdbe.h @@ -28,7 +28,7 @@ extern "C" { #define monetdbe_export extern __declspec(dllexport) #endif #else -#define monetdbe_export __attribute__((__externally_visible__)) extern +#define monetdbe_export extern #endif typedef int64_t monetdbe_cnt; _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org