diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2009-04-02 18:25:58 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2009-04-02 18:25:58 +0000 |
| commit | da4b55c6c301fcf633f4f029b4e30633128d5c61 (patch) | |
| tree | 48a8ab56a2b00dc10c6e0c0edbf95dfb73e02b91 | |
| parent | 326089e8755f5ce75fc4d2781a4012eb96058492 (diff) | |
| download | PROJ-da4b55c6c301fcf633f4f029b4e30633128d5c61.tar.gz PROJ-da4b55c6c301fcf633f4f029b4e30633128d5c61.zip | |
avoid various warnings
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1558 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/jniproj.c | 1 | ||||
| -rw-r--r-- | src/nad2bin.c | 4 | ||||
| -rw-r--r-- | src/nad2nad.c | 4 | ||||
| -rw-r--r-- | src/pj_datums.c | 4 | ||||
| -rw-r--r-- | src/pj_ellps.c | 2 | ||||
| -rw-r--r-- | src/pj_errno.c | 2 | ||||
| -rw-r--r-- | src/pj_units.c | 2 |
8 files changed, 14 insertions, 9 deletions
@@ -1,3 +1,7 @@ +2009-04-02 Frank Warmerdam <warmerdam@pobox.com> + + * src: Fix various warnings. + 2009-03-11 Frank Warmerdam <warmerdam@pobox.com> * man/man1: fix Snyder reference (#29) diff --git a/src/jniproj.c b/src/jniproj.c index 4309886b..33a4cbf8 100644 --- a/src/jniproj.c +++ b/src/jniproj.c @@ -42,6 +42,7 @@ #ifdef JNI_ENABLED +#include <string.h> #include "projects.h" #include "org_proj4_Projections.h" #include <jni.h> diff --git a/src/nad2bin.c b/src/nad2bin.c index 0de16de9..db4bb076 100644 --- a/src/nad2bin.c +++ b/src/nad2bin.c @@ -6,8 +6,8 @@ #define U_SEC_TO_RAD 4.848136811095359935899141023e-12 static char *usage = "<ASCII_dist_table local_bin_table"; - void -main(int argc, char **argv) { + +int main(int argc, char **argv) { struct CTABLE ct; FLP *p, t; size_t tsize; diff --git a/src/nad2nad.c b/src/nad2nad.c index d10c3cc6..e59877da 100644 --- a/src/nad2nad.c +++ b/src/nad2nad.c @@ -222,8 +222,8 @@ process(FILE *fid) { } } } - void -main(int argc, char **argv) { + +int main(int argc, char **argv) { char *arg, **eargv = argv, work[MAX_PARGS]; FILE *fid; int eargc = 0, c; diff --git a/src/pj_datums.c b/src/pj_datums.c index dc82d87f..23253259 100644 --- a/src/pj_datums.c +++ b/src/pj_datums.c @@ -37,7 +37,7 @@ * datum name for the comments if available. */ -C_NAMESPACE struct PJ_DATUMS pj_datums[] = { +C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[] = { /* id definition ellipse comments */ /* -- ---------- ------- -------- */ "WGS84", "towgs84=0,0,0", "WGS84", "", @@ -63,7 +63,7 @@ struct PJ_DATUMS *pj_get_datums_ref() return pj_datums; } -C_NAMESPACE struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { +C_NAMESPACE_VAR struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { /* id definition */ /* -- ---------- */ "greenwich", "0dE", diff --git a/src/pj_ellps.c b/src/pj_ellps.c index 313ef21d..68521926 100644 --- a/src/pj_ellps.c +++ b/src/pj_ellps.c @@ -2,7 +2,7 @@ #define PJ_ELLPS__ #include "projects.h" -C_NAMESPACE struct PJ_ELLPS +C_NAMESPACE_VAR struct PJ_ELLPS pj_ellps[] = { "MERIT", "a=6378137.0", "rf=298.257", "MERIT 1983", "SGS85", "a=6378136.0", "rf=298.257", "Soviet Geodetic System 85", diff --git a/src/pj_errno.c b/src/pj_errno.c index 26ff2d16..8b91ab29 100644 --- a/src/pj_errno.c +++ b/src/pj_errno.c @@ -2,7 +2,7 @@ #include <projects.h> -C_NAMESPACE int pj_errno = 0; +C_NAMESPACE_VAR int pj_errno = 0; /************************************************************************/ /* pj_get_errno_ref() */ diff --git a/src/pj_units.c b/src/pj_units.c index 08d8bb07..bb39f91b 100644 --- a/src/pj_units.c +++ b/src/pj_units.c @@ -4,7 +4,7 @@ /* Field 2 that contains the multiplier to convert named units to meters ** may be expressed by either a simple floating point constant or a ** numerator/denomenator values (e.g. 1/1000) */ -C_NAMESPACE struct PJ_UNITS +C_NAMESPACE_VAR struct PJ_UNITS pj_units[] = { "km", "1000.", "Kilometer", "m", "1.", "Meter", |