ICU-6.2.4.tar.gz

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

diff --git a/icuSources/common/umapfile.c b/icuSources/common/umapfile.c
index fb4b200d6204eed3a4f9ba428a245683f408fede..b08d3acc08263ad96b324891ef4ba87ae21a8249 100644 (file)
--- a/icuSources/common/umapfile.c
+++ b/icuSources/common/umapfile.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1999-2003, International Business Machines
+*   Copyright (C) 1999-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************/
@@ -15,7 +15,7 @@
  *         wrapper functions.
  *
  *----------------------------------------------------------------------------*/
-#include "unicode/utypes.h"
+#include "unicode/putil.h"
 
 
 #include "udatamem.h"
@@ -32,7 +32,7 @@
 
 #ifdef WIN32
 #   define WIN32_LEAN_AND_MEAN
-#   define NOGDI
+#   define VC_EXTRALEAN
 #   define NOUSER
 #   define NOSERVICE
 #   define NOIME
@@ -46,7 +46,7 @@
 #   define MAP_IMPLEMENTATION MAP_WIN32
 
 /* ### Todo: properly auto detect mmap(). Until then, just add your platform here. */
-#elif U_HAVE_MMAP || defined(AIX) || defined(HPUX) || defined(OS390) || defined(PTX)
+#elif U_HAVE_MMAP || defined(U_AIX) || defined(U_HPUX) || defined(OS390) || defined(PTX)
     typedef size_t MemoryMap;
 
 #   define IS_MAP(map) ((map)!=0)
@@ -177,7 +177,7 @@
         }
 
         /* get a view of the mapping */
-#ifndef HPUX
+#ifndef U_HPUX
         data=mmap(0, length, PROT_READ, MAP_SHARED,  fd, 0);
 #else
         data=mmap(0, length, PROT_READ, MAP_PRIVATE, fd, 0);