From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Tue, 11 Mar 2014 10:27:01 +0000 (+0000)
Subject: [trunk] Rework fseek ifdefs blockers, it breaks the 64bits behavior for fseeko
X-Git-Tag: version.2.0.1~4^2~52
X-Git-Url: https://main.carlh.net/gitweb/?p=openjpeg.git;a=commitdiff_plain;h=fa436eb36871b2c0c996823af7fceb1f629d0ebf

[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 f7f1f585..8b072c58 100644
--- 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__) && \