From 9863d8d1d24f2331193d5a42473fbd2422debee8 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Mon, 3 Mar 2014 08:49:28 +0000 Subject: [PATCH] [trunk] Avoid conflicting declarion for fseek in openjp2 vs fseek in openjpip --- src/lib/openjp2/opj_includes.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h index bdbb7c6c..346f3a3c 100644 --- a/src/lib/openjp2/opj_includes.h +++ b/src/lib/openjp2/opj_includes.h @@ -56,10 +56,12 @@ ftello() only on systems with special LFS support since some systems (e.g. FreeBSD) support a 64-bit off_t by default. */ +#if !defined(OPENJPIP_H_) && defined(SERVER) /* server implementation uses fcgi/fseek*/ #if defined(OPJ_HAVE_FSEEKO) # define fseek fseeko # define ftell ftello #endif +#endif #if defined(WIN32) && !defined(Windows95) && !defined(__BORLANDC__) && \