[trunk] Avoid conflicting declarion for fseek in openjp2 vs fseek in openjpip

diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h
index bdbb7c6cebfbb8eb5290c60485e88919327effa3..346f3a3c659ca44b22a90ecef3ad4a7922e425d7 100644 (file)
--- 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__) && \