check for PROJ6

jmckenna · github-actions[bot] · commit 93d4b6951e77 · 2022-03-04T12:19:09.000Z
diff --git a/mapproject.c b/mapproject.c
@@ -362,7 +362,11 @@ static void msProjErrorLogger(void * user_data,
                              int level, const char * message)
 {
     (void)user_data;
-    if( level == PJ_LOG_ERROR && msGetGlobalDebugLevel() >= MS_DEBUGLEVEL_VV)
+#if PROJ_VERSION_MAJOR >= 6    
+    if( level == PJ_LOG_ERROR && msGetGlobalDebugLevel() >= MS_DEBUGLEVEL_VV )
+#else
+    if( level == PJ_LOG_ERROR )
+#endif
     {
         msDebug( "PROJ: Error: %s\n", message );
     }

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,11 @@ static void msProjErrorLogger(void * user_data,`
`362`	`362`	`int level, const char * message)`
`363`	`363`	`{`
`364`	`364`	`(void)user_data;`
`365`		`- if( level == PJ_LOG_ERROR && msGetGlobalDebugLevel() >= MS_DEBUGLEVEL_VV)`
	`365`	`+#if PROJ_VERSION_MAJOR >= 6`
	`366`	`+ if( level == PJ_LOG_ERROR && msGetGlobalDebugLevel() >= MS_DEBUGLEVEL_VV )`
	`367`	`+#else`
	`368`	`+ if( level == PJ_LOG_ERROR )`
	`369`	`+#endif`
`366`	`370`	`{`
`367`	`371`	`msDebug( "PROJ: Error: %s\n", message );`
`368`	`372`	`}`