Weed out proj_api.h datatypes and replace them with their proj.h counterparts

2 files changed, 11 insertions, 9 deletions

diff --git a/src/tests/multistresstest.cpp b/src/tests/multistresstest.cpp
index 51720fbd..674f5ded 100644
--- a/src/tests/multistresstest.cpp
+++ b/src/tests/multistresstest.cpp
@@ -172,7 +172,7 @@ static TestItem test_list[] = {
 
 static volatile int active_thread_count = 0;
 
-static projPJ custom_pj_init_plus_ctx(projCtx ctx, const char* def)
+static PJ *custom_pj_init_plus_ctx(PJ_CONTEXT *ctx, const char* def)
 {
     return pj_init_plus_ctx(ctx, def);
 }
@@ -191,11 +191,12 @@ static void TestThread()
 /* -------------------------------------------------------------------- */
 /*      Initialize coordinate system definitions.                       */
 /* -------------------------------------------------------------------- */
-    projPJ *src_pj_list, *dst_pj_list;
-    projCtx ctx = pj_ctx_alloc();
+    PJ **src_pj_list;
+    PJ **dst_pj_list;
+    PJ_CONTEXT *ctx = pj_ctx_alloc();
 
-    src_pj_list = (projPJ *) calloc(test_count,sizeof(projPJ));
-    dst_pj_list = (projPJ *) calloc(test_count,sizeof(projPJ));
+    src_pj_list = (PJ **) calloc(test_count,sizeof(PJ));
+    dst_pj_list = (PJ **) calloc(test_count,sizeof(PJ));
 
     if(!reinit_every_iteration)
     {
@@ -345,7 +346,8 @@ static int do_main(void)
     {
         TestItem *test = test_list + i;
 
-        projPJ src_pj, dst_pj;
+        PJ *src_pj;
+        PJ *dst_pj;
 
         src_pj = custom_pj_init_plus_ctx( pj_get_default_ctx(), test->src_def );
         dst_pj = custom_pj_init_plus_ctx( pj_get_default_ctx(), test->dst_def );
diff --git a/src/tests/test228.cpp b/src/tests/test228.cpp
index bffb8e79..ae2eb9cc 100644
--- a/src/tests/test228.cpp
+++ b/src/tests/test228.cpp
@@ -50,9 +50,9 @@ static volatile int started = 0;
 
 static void* thread_main(void* unused)
 {
-    projCtx p_proj_ctxt;
-    projPJ p_WGS84_proj;
-    projPJ p_OSGB36_proj;
+    PJ_CONTEXT *p_proj_ctxt;
+    PJ *p_WGS84_proj;
+    PJ * p_OSGB36_proj;
     (void)unused;
 
     __sync_add_and_fetch(&started, 1);