Changeset: a07cf8d1131a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a07cf8d1131a Modified Files: sql/backends/monet5/vaults/shp/shp.h Branch: Jun2016 Log Message:
Undefine symbols that get redefined in gdal.h. Via cpl_port.h and cpl_config.h. diffs (17 lines): 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 @@ -10,6 +10,13 @@ #define _SHP_ #include "mal.h" #include "mal_client.h" +/* these are redefined in gdal.h */ +#undef PACKAGE_BUGREPORT +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_URL +#undef PACKAGE_VERSION #include <gdal.h> #include <ogr_api.h> _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
