[GRASS-SVN] r40714 - grass/branches/develbranch_6/lib/gis

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Jan 27 19:24:41 EST 2010


Author: glynn
Date: 2010-01-27 19:24:41 -0500 (Wed, 27 Jan 2010)
New Revision: 40714

Modified:
   grass/branches/develbranch_6/lib/gis/gdal.c
Log:
Use stdcall-decorated names on Windows


Modified: grass/branches/develbranch_6/lib/gis/gdal.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/gdal.c	2010-01-28 00:23:21 UTC (rev 40713)
+++ grass/branches/develbranch_6/lib/gis/gdal.c	2010-01-28 00:24:41 UTC (rev 40714)
@@ -102,11 +102,19 @@
 {
     load_library();
 
+# ifdef _WIN32
+    pGDALAllRegister   = get_symbol("_GDALAllRegister at 0");
+    pGDALOpen          = get_symbol("_GDALOpen at 8");
+    pGDALClose         = get_symbol("_GDALClose at 4");
+    pGDALGetRasterBand = get_symbol("_GDALGetRasterBand at 8");
+    pGDALRasterIO      = get_symbol("_GDALRasterIO at 48");
+#else
     pGDALAllRegister   = get_symbol("GDALAllRegister");
     pGDALOpen          = get_symbol("GDALOpen");
     pGDALClose         = get_symbol("GDALClose");
     pGDALGetRasterBand = get_symbol("GDALGetRasterBand");
     pGDALRasterIO      = get_symbol("GDALRasterIO");
+#endif
 }
 
 #else /* GDAL_DYNAMIC */



More information about the grass-commit mailing list