ICU-461.18.tar.gz

[apple/icu.git] / icuSources / common / locmap.h

diff --git a/icuSources/common/locmap.h b/icuSources/common/locmap.h
index e1a5b3792d5fc3b875c5b0b97b2fa4ecc3792ea7..7db06070ec3fd3b007c95145fc9090693c78164e 100644 (file)
--- a/icuSources/common/locmap.h
+++ b/icuSources/common/locmap.h
@@ -1,16 +1,12 @@
 /*
 ******************************************************************************
 *
 /*
 ******************************************************************************
 *

-*   Copyright (C) 1996-2003, International Business Machines
+*   Copyright (C) 1996-2004, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************

-*/
-/*
-*============================================================================

 *
 * File locmap.h      : Locale Mapping Classes
 *
 * File locmap.h      : Locale Mapping Classes

-*

 * 
 *
 * Created by: Helena Shih
 * 
 *
 * Created by: Helena Shih


@@ -25,21 +21,17 @@
 *============================================================================
 */
 
 *============================================================================
 */
 

-/* include this first so that we are sure to get WIN32 defined */
-#include "unicode/utypes.h"
-

 #ifndef LOCMAP_H
 #define LOCMAP_H
 
 #ifndef LOCMAP_H
 #define LOCMAP_H
 

-U_CAPI const char* U_EXPORT2 
-uprv_defaultCodePageForLocale(const char *locale);
+#include "unicode/utypes.h"

 
 

-#ifdef WIN32

 #define LANGUAGE_LCID(hostID) (uint16_t)(0x03FF & hostID)
 
 U_CAPI const char *uprv_convertToPosix(uint32_t hostid, UErrorCode* status);
 
 #define LANGUAGE_LCID(hostID) (uint16_t)(0x03FF & hostID)
 
 U_CAPI const char *uprv_convertToPosix(uint32_t hostid, UErrorCode* status);
 

-U_CAPI uint32_t uprv_convertToLCID(const char* posixID, UErrorCode* status);
-#endif /* WIN32 */
+/* Don't call this function directly. Use uloc_getLCID instead. */
+U_CAPI uint32_t uprv_convertToLCID(const char *langID, const char* posixID, UErrorCode* status);

 
 #endif /* LOCMAP_H */
 
 #endif /* LOCMAP_H */

+