forked from pool/mapserver
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
|
diff -ur mapserver-5.2.1/mapogcfilter.c mapserver-5.2.1_new/mapogcfilter.c
|
||
|
|
--- mapserver-5.2.1/mapogcfilter.c 2008-11-07 17:13:32.000000000 +0100
|
||
|
|
+++ mapserver-5.2.1_new/mapogcfilter.c 2009-01-07 19:45:44.000000000 +0100
|
||
|
|
@@ -3615,7 +3615,7 @@
|
||
|
|
char *pszWild = NULL;
|
||
|
|
char *pszSingle = NULL;
|
||
|
|
char *pszEscape = NULL;
|
||
|
|
- char szTmp[3];
|
||
|
|
+ char szTmp[4];
|
||
|
|
|
||
|
|
int nLength=0, i=0, iBuffer = 0;
|
||
|
|
int bCaseInsensitive = 0;
|
||
|
|
diff -ur mapserver-5.2.1/mapowscommon.c mapserver-5.2.1_new/mapowscommon.c
|
||
|
|
--- mapserver-5.2.1/mapowscommon.c 2008-07-09 13:27:53.000000000 +0200
|
||
|
|
+++ mapserver-5.2.1_new/mapowscommon.c 2009-01-07 19:44:23.000000000 +0100
|
||
|
|
@@ -493,7 +493,7 @@
|
||
|
|
/* add attributes to root element */
|
||
|
|
xmlNewProp(psRootNode, BAD_CAST "version", BAD_CAST version);
|
||
|
|
|
||
|
|
- if (language != "undefined") {
|
||
|
|
+ if (strcmp(language, "undefined")) {
|
||
|
|
if (ows_version == OWS_1_0_0) {
|
||
|
|
ows_version_string = strdup("1.0.0");
|
||
|
|
xmlNewProp(psRootNode, BAD_CAST "language", BAD_CAST language);
|
||
|
|
diff -ur mapserver-5.2.1/mapscript/java/Makefile.in mapserver-5.2.1_new/mapscript/java/Makefile.in
|
||
|
|
--- mapserver-5.2.1/mapscript/java/Makefile.in 2008-01-10 15:48:35.000000000 +0100
|
||
|
|
+++ mapserver-5.2.1_new/mapscript/java/Makefile.in 2009-01-07 19:42:49.000000000 +0100
|
||
|
|
@@ -211,7 +211,7 @@
|
||
|
|
# Java Stuff
|
||
|
|
#
|
||
|
|
JAVADOC=javadoc
|
||
|
|
-JAVAC=javac
|
||
|
|
+JAVAC=javac -target 1.5 -source 1.5
|
||
|
|
JAVA=java
|
||
|
|
JAR=jar
|
||
|
|
JAVA_INCLUDE=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/@OS_INCLUDE_DIR@
|