Portability cleanups for the code in PR #6 (and a few additional source files)

Eliminated mixed code and declarations, converted C++ style comments and
probably did a few more things highlighted by running gcc with the "-W
-Wall -Wextra -pedantic" flags

1 files changed, 4 insertions, 4 deletions

diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c
index 3b25fb26..e248b8cc 100644
--- a/src/PJ_omerc.c
+++ b/src/PJ_omerc.c
@@ -123,15 +123,15 @@ static void freeup (PJ *P) {
 
 
 PJ *PROJECTION(omerc) {
+    double con, com, cosph0, D, F, H, L, sinph0, p, J, gamma=0,
+        gamma0, lamc=0, lam1=0, lam2=0, phi1=0, phi2=0, alpha_c=0;
+    int alp, gam, no_off = 0;
+
     struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque));
     if (0==Q)
         return freeup_new (P);
     P->opaque = Q;
 
-    double con, com, cosph0, D, F, H, L, sinph0, p, J, gamma=0,
-        gamma0, lamc=0, lam1=0, lam2=0, phi1=0, phi2=0, alpha_c=0;
-    int alp, gam, no_off = 0;
-
     Q->no_rot = pj_param(P->ctx, P->params, "tno_rot").i;
         if ((alp = pj_param(P->ctx, P->params, "talpha").i) != 0)
         alpha_c = pj_param(P->ctx, P->params, "ralpha").f;