From: Andreas Oberritter Date: Sat, 15 Aug 2009 14:17:19 +0000 (+0200) Subject: Don't define open or fopen if _FILE_OFFSET_BITS == 64 X-Git-Tag: 2.6.0~142 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/68b2a05336cba25b93ebc91a7b7ee9b5394dbacc?hp=ce50a187c68d7dcbbed94e10de5950df29d7b525 Don't define open or fopen if _FILE_OFFSET_BITS == 64 If _FILE_OFFSET_BITS is 64, then (f)open will be converted automatically to (f)open64, resulting in duplicate symbols --- diff --git a/tools/libopen.c b/tools/libopen.c index a3ae07cd..f6b935ee 100644 --- a/tools/libopen.c +++ b/tools/libopen.c @@ -45,6 +45,7 @@ int open64(const char *pathname, int flags, ...) return fd; } +#if _FILE_OFFSET_BITS != 64 int open(const char *pathname, int flags, ...) { typedef int (*FUNC_PTR) (const char* pathname, int flags, ...); @@ -81,6 +82,7 @@ int open(const char *pathname, int flags, ...) } return fd; } +#endif FILE *fopen64(const char *pathname, const char *mode) { @@ -120,6 +122,7 @@ FILE *fopen64(const char *pathname, const char *mode) return f; } +#if _FILE_OFFSET_BITS != 64 FILE *fopen(const char *pathname, const char *mode) { typedef FILE *(*FUNC_PTR) (const char* pathname, const char *mode); @@ -157,6 +160,7 @@ FILE *fopen(const char *pathname, const char *mode) } return f; } +#endif int socket(int domain, int type, int protocol) {