From 47d116374a54446fd64712fc6dfc1370758f48b8 Mon Sep 17 00:00:00 2001
From: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
Date: Wed, 10 Dec 2008 12:36:28 +0000
Subject: [PATCH] Resolve local merge conflict from previous commit.

git-svn-id: http://svn.osgeo.org/postgis/trunk@3374 b70326c6-7e19-0410-871a-916f4a2858ee
---
 liblwgeom/liblwgeom.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h
index de07e5169..f7b84e8fb 100644
--- 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