[GRASS-SVN] r40741 - grass/branches/releasebranch_6_4/lib/gis

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Jan 29 15:30:49 EST 2010


Author: hellik
Date: 2010-01-29 15:30:48 -0500 (Fri, 29 Jan 2010)
New Revision: 40741

Modified:
   grass/branches/releasebranch_6_4/lib/gis/gdal.c
Log:
Use stdcall-decorated names on Windows (see r40714)

Modified: grass/branches/releasebranch_6_4/lib/gis/gdal.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/gis/gdal.c	2010-01-29 20:14:42 UTC (rev 40740)
+++ grass/branches/releasebranch_6_4/lib/gis/gdal.c	2010-01-29 20:30:48 UTC (rev 40741)
@@ -104,11 +104,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