diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2015-06-28 18:43:13 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2015-06-28 18:43:13 +0200 |
| commit | 9b8aed201ea3e108f969332732b110f48926d5a1 (patch) | |
| tree | 5c9847a019a4dcca26bd2ade6a4ad7da236f0159 /src/geodesic.c | |
| parent | 02232fd5fe58783a40a8cf124170d9ad4629b1ce (diff) | |
| download | PROJ-9b8aed201ea3e108f969332732b110f48926d5a1.tar.gz PROJ-9b8aed201ea3e108f969332732b110f48926d5a1.zip | |
geodesic.c: Fix 'ISO C90 forbids mixed declarations and code' warning in GCC < 4.6 case
Diffstat (limited to 'src/geodesic.c')
| -rw-r--r-- | src/geodesic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/geodesic.c b/src/geodesic.c index 9a8f043c..4bda1500 100644 --- a/src/geodesic.c +++ b/src/geodesic.c @@ -1087,6 +1087,9 @@ real InverseStart(const struct geod_geodesic* g, /* bet12 = bet2 - bet1 in [0, pi); bet12a = bet2 + bet1 in (-pi, 0] */ sbet12 = sbet2 * cbet1 - cbet2 * sbet1, cbet12 = cbet2 * cbet1 + sbet2 * sbet1; + boolx shortline = cbet12 >= 0 && sbet12 < (real)(0.5) && + cbet2 * lam12 < (real)(0.5); + real omg12 = lam12, somg12, comg12, ssig12, csig12; #if defined(__GNUC__) && __GNUC__ == 4 && \ (__GNUC_MINOR__ < 6 || defined(__MINGW32__)) /* Volatile declaration needed to fix inverse cases @@ -1104,9 +1107,6 @@ real InverseStart(const struct geod_geodesic* g, #else real sbet12a = sbet2 * cbet1 + cbet2 * sbet1; #endif - boolx shortline = cbet12 >= 0 && sbet12 < (real)(0.5) && - cbet2 * lam12 < (real)(0.5); - real omg12 = lam12, somg12, comg12, ssig12, csig12; if (shortline) { real sbetm2 = sq(sbet1 + sbet2); /* sin((bet1+bet2)/2)^2 |