[GRASS-SVN] r72476 - grass/trunk/raster/r.sunhours

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-03-21 11:28:26 -0700 (Wed, 21 Mar 2018)
New Revision: 72476

Modified:
   grass/trunk/raster/r.sunhours/main.c
Log:
r.sunhours: adjust support for PROJ 5+ API

Modified: grass/trunk/raster/r.sunhours/main.c
===================================================================
--- grass/trunk/raster/r.sunhours/main.c	2018-03-21 18:26:42 UTC (rev 72475)
+++ grass/trunk/raster/r.sunhours/main.c	2018-03-21 18:28:26 UTC (rev 72476)
@@ -294,11 +294,7 @@
 	    north_ll = (window.north + window.south) / 2;
 	    east_ll = (window.east + window.west) / 2;
 	    if (do_reproj) {
-#ifdef HAVE_PROJ_H
 		if (GPJ_do_proj_ll(&east_ll, &north_ll, &iproj, PJ_INV) < 0)
-#else
-		if (pj_do_proj(&east_ll, &north_ll, &iproj, &oproj) < 0)
-#endif
 		    G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 	    }
 	    pd.timezone = east_ll / 15.;
@@ -392,11 +388,7 @@
 
 	    if (do_reproj) {
 		north_ll = north;
-#ifdef HAVE_PROJ_H
 		if (GPJ_do_proj_ll(&east_ll, &north_ll, &iproj, PJ_INV) < 0)
-#else
-		if (pj_do_proj(&east_ll, &north_ll, &iproj, &oproj) < 0)
-#endif
 		    G_fatal_error(_("Error in pj_do_proj (projection of input coordinate pair)"));
 	    }