ICU-491.11.1.tar.gz

[apple/icu.git] / icuSources / common / umapfile.c

diff --git a/icuSources/common/umapfile.c b/icuSources/common/umapfile.c
index f9f857e9dbeea777e61d9df10a114001b5fe7df9..05caecfff2c5ca8318d30488a9ff825433e40590 100644 (file)
--- a/icuSources/common/umapfile.c
+++ b/icuSources/common/umapfile.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1999-2010, International Business Machines
+*   Copyright (C) 1999-2011, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************/
@@ -59,10 +59,6 @@
 #       define LIB_SUFFIX ".dll"
         /* This is inconvienient until we figure out what to do with U_ICUDATA_NAME in utypes.h */
 #       define U_ICUDATA_ENTRY_NAME "icudt" U_ICU_VERSION_SHORT U_LIB_SUFFIX_C_NAME_STRING "_dat"
-#   else
-#       if defined(U_DARWIN)
-#           include <TargetConditionals.h>
-#       endif
 #   endif
 #elif MAP_IMPLEMENTATION==MAP_STDIO
 #   include <stdio.h>
@@ -181,7 +177,7 @@
         }
 
         /* get a view of the mapping */
-#ifndef U_HPUX
+#if U_PLATFORM != U_PF_HPUX
         data=mmap(0, length, PROT_READ, MAP_SHARED,  fd, 0);
 #else
         data=mmap(0, length, PROT_READ, MAP_PRIVATE, fd, 0);
@@ -194,7 +190,7 @@
         pData->map = (char *)data + length;
         pData->pHeader=(const DataHeader *)data;
         pData->mapAddr = data;
-#if defined(U_DARWIN) && TARGET_OS_IPHONE
+#if U_PLATFORM == U_PF_IPHONE
         posix_madvise(data, length, POSIX_MADV_RANDOM);
 #endif
         return TRUE;