Authored by devel-hb

removed warnings in proj4

@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 * datum name for the comments if available. 76 * datum name for the comments if available.
77 */ 77 */
78 78
79 -C_NAMESPACE struct PJ_DATUMS pj_datums[] = { 79 +struct PJ_DATUMS pj_datums[] = {
80 /* id definition ellipse comments */ 80 /* id definition ellipse comments */
81 /* -- ---------- ------- -------- */ 81 /* -- ---------- ------- -------- */
82 "WGS84", "towgs84=0,0,0", "WGS84", "", 82 "WGS84", "towgs84=0,0,0", "WGS84", "",
@@ -102,7 +102,7 @@ struct PJ_DATUMS *pj_get_datums_ref() @@ -102,7 +102,7 @@ struct PJ_DATUMS *pj_get_datums_ref()
102 return pj_datums; 102 return pj_datums;
103 } 103 }
104 104
105 -C_NAMESPACE struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { 105 +struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = {
106 /* id definition */ 106 /* id definition */
107 /* -- ---------- */ 107 /* -- ---------- */
108 "greenwich", "0dE", 108 "greenwich", "0dE",
@@ -5,7 +5,7 @@ static const char SCCSID[]="@(#)pj_ellps.c 4.6 95/08/25 GIE REL"; @@ -5,7 +5,7 @@ static const char SCCSID[]="@(#)pj_ellps.c 4.6 95/08/25 GIE REL";
5 #define PJ_ELLPS__ 5 #define PJ_ELLPS__
6 #include "projects.h" 6 #include "projects.h"
7 7
8 -C_NAMESPACE struct PJ_ELLPS 8 +struct PJ_ELLPS
9 pj_ellps[] = { 9 pj_ellps[] = {
10 "MERIT", "a=6378137.0", "rf=298.257", "MERIT 1983", 10 "MERIT", "a=6378137.0", "rf=298.257", "MERIT 1983",
11 "SGS85", "a=6378136.0", "rf=298.257", "Soviet Geodetic System 85", 11 "SGS85", "a=6378136.0", "rf=298.257", "Soviet Geodetic System 85",
@@ -5,7 +5,7 @@ static const char SCCSID[]="@(#)pj_errno.c 4.3 95/06/03 GIE REL"; @@ -5,7 +5,7 @@ static const char SCCSID[]="@(#)pj_errno.c 4.3 95/06/03 GIE REL";
5 5
6 #include "projects.h" 6 #include "projects.h"
7 7
8 -C_NAMESPACE int pj_errno = 0; 8 +int pj_errno = 0;
9 9
10 /************************************************************************/ 10 /************************************************************************/
11 /* pj_get_errno_ref() */ 11 /* pj_get_errno_ref() */
@@ -7,7 +7,7 @@ static const char SCCSID[]="@(#)pj_units.c 4.6 93/06/12 GIE REL"; @@ -7,7 +7,7 @@ static const char SCCSID[]="@(#)pj_units.c 4.6 93/06/12 GIE REL";
7 /* Field 2 that contains the multiplier to convert named units to meters 7 /* Field 2 that contains the multiplier to convert named units to meters
8 ** may be expressed by either a simple floating point constant or a 8 ** may be expressed by either a simple floating point constant or a
9 ** numerator/denomenator values (e.g. 1/1000) */ 9 ** numerator/denomenator values (e.g. 1/1000) */
10 -C_NAMESPACE struct PJ_UNITS 10 +struct PJ_UNITS
11 pj_units[] = { 11 pj_units[] = {
12 "km", "1000.", "Kilometer", 12 "km", "1000.", "Kilometer",
13 "m", "1.", "Meter", 13 "m", "1.", "Meter",