[GRASS-SVN] r45878 - in grass/branches/releasebranch_6_4: general/g.region include

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-04-08 20:51:54 -0700 (Fri, 08 Apr 2011)
New Revision: 45878

Modified:
   grass/branches/releasebranch_6_4/general/g.region/printwindow.c
   grass/branches/releasebranch_6_4/include/gprojects.h
Log:
projects.h dropped in proj4 upstream rev 1975. (#1335, merge from devbr6 r45789)

Modified: grass/branches/releasebranch_6_4/general/g.region/printwindow.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.region/printwindow.c	2011-04-09 03:48:14 UTC (rev 45877)
+++ grass/branches/releasebranch_6_4/general/g.region/printwindow.c	2011-04-09 03:51:54 UTC (rev 45878)
@@ -1,10 +1,5 @@
 #include <string.h>
 #include <stdlib.h>
-
-#ifndef __MINGW32__
-#include <projects.h>
-#endif
-
 #include <grass/gis.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>

Modified: grass/branches/releasebranch_6_4/include/gprojects.h
===================================================================
--- grass/branches/releasebranch_6_4/include/gprojects.h	2011-04-09 03:48:14 UTC (rev 45877)
+++ grass/branches/releasebranch_6_4/include/gprojects.h	2011-04-09 03:51:54 UTC (rev 45878)
@@ -107,9 +107,8 @@
 void GPJ_free_ellps(struct gpj_ellps *);
 
 
-#ifdef __MINGW32__
 /* PROJ.4's private datastructures copied from projects.h as removed
-   from osgeo4w; pending better solution. see:
+   from upstream; pending better solution. see:
    http://trac.osgeo.org/proj/ticket/98 */
 
 typedef struct { double u, v; } LP;
@@ -131,6 +130,5 @@
 
 int pj_factors(LP, void *, double, struct FACTORS *);
 /* end of copy */
-#endif
 
 #endif