[trunk] Rework fseek ifdefs blockers, it breaks the 64bits behavior for fseeko

diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h
index f7f1f585fa0d3eb5e4ebf3fbdb6c9965e3ead68f..8b072c5853b3e7e4d4ef61a3282a6a38d11beec0 100644 (file)
--- a/src/lib/openjp2/opj_includes.h
+++ b/src/lib/openjp2/opj_includes.h
@@ -56,12 +56,10 @@
   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)
+#if defined(OPJ_HAVE_FSEEKO) && !defined(fseek)
 #  define fseek  fseeko
 #  define ftell  ftello
 #endif
-#endif
 
 
 #if defined(WIN32) && !defined(Windows95) && !defined(__BORLANDC__) && \