Fix proj4 build

qgis · Apr 5, 2019 · 250d0d1 · 250d0d1
1 parent 70a8d49
commit 250d0d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp
@@ -472,7 +472,7 @@ void QgsCustomProjectionDialog::pbnCalculate_clicked()
 
 #if PROJ_VERSION_MAJOR<6
   northing *= DEG_TO_RAD;
-  easting * = DEG_TO_RAD;
+  easting *= DEG_TO_RAD;
 #endif
 
   if ( !okN || !okE )

diff --git a/src/core/qgscoordinatetransform_p.h b/src/core/qgscoordinatetransform_p.h
@@ -34,6 +34,7 @@
 #include <QSharedData>
 
 #if PROJ_VERSION_MAJOR<6
+typedef void *projPJ;
 #ifndef USE_THREAD_LOCAL
 #include <QThreadStorage>
 #endif
@@ -48,7 +49,7 @@ typedef PJ *ProjData;
 #include "qgscoordinatetransformcontext.h"
 
 #if PROJ_VERSION_MAJOR<6
-typedef void *projPJ;
+
 typedef void *projCtx;
 
 /**