Move logging functions to proj.h API

3 files changed, 16 insertions, 24 deletions

diff --git a/src/pj_internal.c b/src/pj_internal.c
index 4da47051..891e0b9f 100644
--- a/src/pj_internal.c
+++ b/src/pj_internal.c
@@ -364,11 +364,6 @@ to that context.
     return;
 }
 
-
-
-
-
-
 /*  logging  */
 
 /* pj_vlog resides in pj_log.c and relates to pj_log as vsprintf relates to sprintf */
@@ -376,11 +371,11 @@ void pj_vlog( projCtx ctx, int level, const char *fmt, va_list args );
 
 
 /***************************************************************************************/
-enum proj_log_level proj_log_level (PJ_CONTEXT *ctx, enum proj_log_level log_level) {
+PJ_LOG_LEVEL proj_log_level (PJ_CONTEXT *ctx, PJ_LOG_LEVEL log_level) {
 /****************************************************************************************
    Set logging level 0-3. Higher number means more debug info. 0 turns it off
 ****************************************************************************************/
-    enum proj_log_level previous;
+    PJ_LOG_LEVEL previous;
     if (0==ctx)
         ctx = pj_get_default_ctx();
     if (0==ctx)
diff --git a/src/proj.h b/src/proj.h
index 7bc9b10e..3d64ed1a 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -268,6 +268,17 @@ struct PJ_INIT_INFO {
     char        lastupdate[16];     /* Date of last update in YYYY-MM-DD format */
 };
 
+typedef enum PJ_LOG_LEVEL {
+    PJ_LOG_NONE  = 0,
+    PJ_LOG_ERROR = 1,
+    PJ_LOG_DEBUG = 2,
+    PJ_LOG_TRACE = 3,
+    PJ_LOG_TELL  = 4,
+    PJ_LOG_DEBUG_MAJOR = 2, /* for proj_api.h compatibility */
+    PJ_LOG_DEBUG_MINOR = 3  /* for proj_api.h compatibility */
+} PJ_LOG_LEVEL;
+
+typedef void (*PJ_LOG_FUNCTION)(void *, int, const char *);
 
 
 /* The context type - properly namespaced synonym for projCtx */
@@ -342,7 +353,6 @@ double proj_xyz_dist (PJ_COORD a, PJ_COORD b);
 PJ_COORD proj_geod (const PJ *P, PJ_COORD a, PJ_COORD b);
 
 
-
 /* Set or read error level */
 int  proj_context_errno (PJ_CONTEXT *ctx);
 int  proj_errno (const PJ *P);
@@ -351,6 +361,9 @@ int  proj_errno_reset (const PJ *P);
 int  proj_errno_restore (const PJ *P, int err);
 const char* proj_errno_string (int err);
 
+PJ_LOG_LEVEL proj_log_level (PJ_CONTEXT *ctx, PJ_LOG_LEVEL level);
+void proj_log_func (PJ_CONTEXT *ctx, void *app_data, PJ_LOG_FUNCTION logf);
+
 /* Scaling and angular distortion factors */
 PJ_FACTORS proj_factors(PJ *P, PJ_COORD lp);
 
diff --git a/src/proj_internal.h b/src/proj_internal.h
index 3f6ccde0..1aca9201 100644
--- a/src/proj_internal.h
+++ b/src/proj_internal.h
@@ -97,25 +97,9 @@ double          proj_vgrid_value(PJ *P, PJ_LP lp);
 PJ_LP           proj_hgrid_value(PJ *P, PJ_LP lp);
 PJ_LP           proj_hgrid_apply(PJ *P, PJ_LP lp, PJ_DIRECTION direction);
 
-/* High level functionality for handling thread contexts */
-enum proj_log_level {
-    PJ_LOG_NONE  = 0,
-    PJ_LOG_ERROR = 1,
-    PJ_LOG_DEBUG = 2,
-    PJ_LOG_TRACE = 3,
-    PJ_LOG_TELL  = 4,
-    PJ_LOG_DEBUG_MAJOR = 2, /* for proj_api.h compatibility */
-    PJ_LOG_DEBUG_MINOR = 3  /* for proj_api.h compatibility */
-};
-
-/* Set logging level 0-3. Higher number means more debug info. 0 turns it off */
-enum proj_log_level proj_log_level (PJ_CONTEXT *ctx, enum proj_log_level log_level);
-typedef void (*PJ_LOG_FUNCTION)(void *, int, const char *);
-
 void proj_log_error (PJ *P, const char *fmt, ...);
 void proj_log_debug (PJ *P, const char *fmt, ...);
 void proj_log_trace (PJ *P, const char *fmt, ...);
-void proj_log_func (PJ_CONTEXT *ctx, void *app_data, PJ_LOG_FUNCTION logf);
 
 int pj_ellipsoid (PJ *);
 void pj_inherit_ellipsoid_def (const PJ *src, PJ *dst);