Selaa lähdekoodia

projects.h dropped in proj4 upstream rev 1975. (https://trac.osgeo.org/grass/ticket/1335, merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@45790 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 14 vuotta sitten
vanhempi
commit
9d81ce4e1d
2 muutettua tiedostoa jossa 1 lisäystä ja 8 poistoa
  1. 0 5
      general/g.region/printwindow.c
  2. 1 3
      include/gprojects.h

+ 0 - 5
general/g.region/printwindow.c

@@ -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>

+ 1 - 3
include/gprojects.h

@@ -106,9 +106,8 @@ int GPJ__get_ellipsoid_params(struct Key_Value *,
 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;
@@ -130,6 +129,5 @@ struct FACTORS {
 
 int pj_factors(LP, void *, double, struct FACTORS *);
 /* end of copy */
-#endif
 
 #endif