summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2014-03-11 10:27:01 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2014-03-11 10:27:01 +0000
commitfa436eb36871b2c0c996823af7fceb1f629d0ebf (patch)
tree1d94adcff98cb5ab37b404b8b2825d1ad5d78845 /src
parentfcc658f10669f76555dea1abf9a4cf7ed70662a9 (diff)
[trunk] Rework fseek ifdefs blockers, it breaks the 64bits behavior for fseeko
Diffstat (limited to 'src')
-rw-r--r--src/lib/openjp2/opj_includes.h4
1 files changed, 1 insertions, 3 deletions
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__) && \