[GRASS-SVN] r72475 - grass/trunk/raster/r.sunmask

[svn_grass at osgeo.org]

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

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

Modified: grass/trunk/raster/r.sunmask/g_solposition.c
===================================================================
--- grass/trunk/raster/r.sunmask/g_solposition.c	2018-03-21 18:25:40 UTC (rev 72474)
+++ grass/trunk/raster/r.sunmask/g_solposition.c	2018-03-21 18:26:42 UTC (rev 72475)
@@ -125,11 +125,8 @@
 #endif
 	/* XX do the transform 
 	 *               outx        outy    in_info  out_info */
-#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 (projection of input coordinate pair)"));
 	}