From 76b81c7b3535938ebbb563a6d7ec5565ece61a81 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 22 Nov 2006 18:52:57 +0100 Subject: [PATCH] More stricter check for arm-wince Debian. --- src/conf.h | 4 ++-- src/util.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf.h b/src/conf.h index 1ac024c8..8c87b6eb 100644 --- a/src/conf.h +++ b/src/conf.h @@ -40,8 +40,8 @@ #if ((ACC_OS_WIN32 || ACC_OS_WIN64) && ACC_CC_MWERKS) && defined(__MSL__) # undef HAVE_UTIME_H /* this pulls in */ #endif -// FIXME - quick hack for arm-wince-gcc-3.4 (Debian pocketpc*.deb packages) -#if 1 && (ACC_ARCH_ARM) && defined(__pe__) +// FIXME - quick hack for arm-wince-gcc-3.4 (Debian pocketpc-*.deb packages) +#if 1 && (ACC_ARCH_ARM) && defined(__pe__) && !defined(_WIN32) # undef HAVE_CHMOD # undef HAVE_CHOWN # undef HAVE_LSTAT diff --git a/src/util.cpp b/src/util.cpp index 448a9e21..81f0c667 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -577,8 +577,8 @@ unsigned get_ratio(unsigned u_len, unsigned c_len) extern "C" { -// FIXME - quick hack for arm-wince-gcc-3.4 (Debian pocketpc*.deb packages) -#if 1 && (ACC_ARCH_ARM) && defined(__pe__) +// FIXME - quick hack for arm-wince-gcc-3.4 (Debian pocketpc-*.deb packages) +#if 1 && (ACC_ARCH_ARM) && defined(__pe__) && !defined(__CEGCC__) && !defined(_WIN32) int dup(int fd) { UNUSED(fd); return -1; } #endif