Merge pull request #1148 from kbevers/lists-to-proj.hiso19111_dev

Move struct definitions for proj_list_* functions to proj.h

1 files changed, 6 insertions, 3 deletions

diff --git a/src/PJ_unitconvert.c b/src/PJ_unitconvert.c
index 6e53f6df..e3824c20 100644
--- a/src/PJ_unitconvert.c
+++ b/src/PJ_unitconvert.c
@@ -401,17 +401,20 @@ static double get_unit_conversion_factor(const char* name,
 /***********************************************************************/
     int i;
     const char* s;
+    const PJ_UNITS *units;
+
+    units = proj_list_units();
 
     /* Try first with linear units */
-    for (i = 0; (s = pj_units[i].id) ; ++i) {
+    for (i = 0; (s = units[i].id) ; ++i) {
         if ( strcmp(s, name) == 0 ) {
             if( p_normalized_name ) {
-                *p_normalized_name = pj_units[i].name;
+                *p_normalized_name = units[i].name;
             }
             if( p_is_linear ) {
                 *p_is_linear = 1;
             }
-            return pj_units[i].factor;
+            return units[i].factor;
         }
     }