Fix build issues with OGR disabled

MapServer · Nov 16, 2015 · ab2a612 · ab2a612
1 parent e47e642
commit ab2a612
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/mapimageio.c b/mapimageio.c
@@ -210,7 +210,7 @@ int saveAsJPEG(mapObj *map, rasterBufferObj *rb, streamInfo *info,
       /* If the user doesn't provide a value for JPEGMEM, we want to be sure */
       /* that at least the image size will be used before creating the temporary file */
       cinfo.mem->max_memory_to_use =
-        MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
+        MS_MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
     }
   }
 

diff --git a/mapogcfilter.c b/mapogcfilter.c
@@ -40,6 +40,7 @@
 #include "mapowscommon.h"
 #include "maptime.h"
 #include "mapows.h"
+#include <ctype.h>
 
 static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode);
 

diff --git a/mapogr.cpp b/mapogr.cpp
@@ -1318,6 +1318,7 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo )
 
   return MS_SUCCESS;
 }
+#endif /* USE_OGR */
 
 /************************************************************************/
 /*                           msOGREscapeSQLParam                        */
@@ -1345,6 +1346,7 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString)
 #endif /* USE_OGR */
 }
 
+#ifdef USE_OGR
 /**********************************************************************
  *                     msOGRTranslateMsExpressionToOGRSQL()
  *