Resolve local merge conflict from previous commit.

git-svn-id: http://svn.osgeo.org/postgis/trunk@3374 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h
index de07e516951e4df6fd10068efdceae0c8988297b..f7b84e8fba794a4fb7f9b791f0637f32d0e2ae87 100644 (file)
--- a/liblwgeom/liblwgeom.h
+++ b/liblwgeom/liblwgeom.h
@@ -1182,6 +1182,7 @@ extern void lwfree(void *mem);
 
 /* Utilities */
 extern void trim_trailing_zeros(char *num);
+extern char *lwmessage_truncate(char *str, int startpos, int endpos, int maxlength, int truncdirection);
 
 /* Machine endianness */
 #define XDR 0