diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-03 08:49:28 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-03 08:49:28 +0000 |
| commit | 9863d8d1d24f2331193d5a42473fbd2422debee8 (patch) | |
| tree | f72334d0ea6868079996c9aa286ab43bbbff255e /src/lib | |
| parent | 3ecccb7410d567a660bda84a538d9fd4ea0964b3 (diff) | |
[trunk] Avoid conflicting declarion for fseek in openjp2 vs fseek in openjpip
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/opj_includes.h | 2 |
1 files changed, 2 insertions, 0 deletions
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__) && \ |