Update proj.def to include new geod_ functions. Suppress warning from etmerc.

2 files changed, 29 insertions, 23 deletions

diff --git a/src/proj.def b/src/proj.def
index c872e6aa..ff7be395 100644
--- a/src/proj.def
+++ b/src/proj.def
@@ -54,25 +54,31 @@ EXPORTS
 	pj_ctx_get_app_data	@52
 	pj_log			@53
 	pj_clear_initcache	@54
-	geod_init		@55
-	geod_lineinit		@56
-	geod_genposition	@57
-	geod_position		@58
-	geod_gendirect		@59
-	geod_direct		@60
-	geod_geninverse		@61
-	geod_inverse		@62
-	geod_polygonarea	@63
-	pj_get_spheroid_defn	@64
-	pj_get_default_fileapi  @65
-	pj_ctx_set_fileapi      @66
-	pj_ctx_get_fileapi      @67
-	pj_ctx_fopen            @68
-	pj_ctx_fread            @69
-	pj_ctx_ftell            @70
-	pj_ctx_fclose           @71
-	pj_open_lib             @72
-	pj_atof                 @73
-	pj_strtod               @74
-        pj_fwd3d                @75
-        pj_inv3d                @76
+	pj_get_spheroid_defn	@55
+	pj_get_default_fileapi	@56
+	pj_ctx_set_fileapi	@57
+	pj_ctx_get_fileapi	@58
+	pj_ctx_fopen		@59
+	pj_ctx_fread		@60
+	pj_ctx_ftell		@61
+	pj_ctx_fclose		@62
+	pj_open_lib		@63
+	pj_atof			@64
+	pj_strtod		@65
+	pj_fwd3d		@66
+	pj_inv3d		@67
+	geod_init		@68
+	geod_lineinit		@69
+	geod_genposition	@70
+	geod_position		@71
+	geod_gendirect		@72
+	geod_direct		@73
+	geod_geninverse		@74
+	geod_inverse		@75
+	geod_polygon_init	@76
+	geod_polygon_addedge	@77
+	geod_polygon_addpoint	@78
+	geod_polygon_compute	@79
+	geod_polygon_testedge	@80
+	geod_polygon_testpoint	@81
+	geod_polygonarea	@82
diff --git a/src/proj_etmerc.c b/src/proj_etmerc.c
index a5351f5d..3ef0903f 100644
--- a/src/proj_etmerc.c
+++ b/src/proj_etmerc.c
@@ -308,7 +308,7 @@ ENTRY0(utm)
 		else
 			E_ERROR(-35)
 	else /* nearest central meridian input */
-		if ((zone = floor((adjlon(P->lam0) + PI) * 30. / PI)) < 0)
+		if ((zone = (int)(floor((adjlon(P->lam0) + PI) * 30. / PI))) < 0)
 			zone = 0;
 		else if (zone >= 60)
 			zone = 59;