[GRASS-SVN] r72474 - grass/trunk/raster/r.sun

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-03-21 11:25:40 -0700 (Wed, 21 Mar 2018)
New Revision: 72474

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

Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c	2018-03-21 18:20:27 UTC (rev 72473)
+++ grass/trunk/raster/r.sun/main.c	2018-03-21 18:25:40 UTC (rev 72474)
@@ -1894,11 +1894,7 @@
 			longitude = gridGeom.xp;
 			latitude = gridGeom.yp;
 
-#ifdef HAVE_PROJ_H
 			if (GPJ_do_proj_ll(&longitude, &latitude, &iproj, PJ_INV) < 0) {
-#else
-			if (pj_do_proj(&longitude, &latitude, &iproj, &oproj) < 0) {
-#endif
 			    G_fatal_error("Error in pj_do_proj");
 			}