Resolve local merge conflict from previous commit.

git-svn-id: http://svn.osgeo.org/postgis/trunk@3374 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Mark Cave-Ayland 2008-12-10 12:36:28 +00:00
parent f86114f64c
commit 47d116374a

View file

@ -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