From 250d0d1670f76b8fb51b98e89f1c1c506d4f03cd Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 27 Mar 2019 16:37:19 +1000
Subject: [PATCH] Fix proj4 build

---
 src/app/qgscustomprojectiondialog.cpp | 2 +-
 src/core/qgscoordinatetransform_p.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp
index b27c733b9959..86a15c424d9d 100644
--- 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
index 59f673efc1f6..bba7ec709792 100644
--- 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;
 
 /**