ICU-8731 move some @internal definitions to putilimp.h

X-SVN-Rev: 30433

diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp
index 4085ddbfaedb4375b37def4989b9ea938d014185..d340f406dbdea198a1074fe3ae82e2d168ff71ff 100644 (file)
--- a/icu4c/source/common/locid.cpp
+++ b/icu4c/source/common/locid.cpp
@@ -32,6 +32,7 @@
 
 #include "unicode/locid.h"
 #include "unicode/uloc.h"
+#include "putilimp.h"
 #include "umutex.h"
 #include "uassert.h"
 #include "cmemory.h"

diff --git a/icu4c/source/common/putilimp.h b/icu4c/source/common/putilimp.h
index a82d77297dd45e3fff7f9a60d98892a45f183041..e4d64aa76a8ca14634d806594607f24da88117f8 100644 (file)
--- a/icu4c/source/common/putilimp.h
+++ b/icu4c/source/common/putilimp.h
@@ -19,6 +19,12 @@
 #include "unicode/utypes.h"
 #include "unicode/putil.h"
 
+/** Define this to 1 if your platform supports IEEE 754 floating point,
+   to 0 if it does not. */
+#ifndef IEEE_754
+#   define IEEE_754 1
+#endif
+
 /**
  * \def U_HAVE_MSVC_2003_OR_EARLIER
  * Flag for workaround of MSVC 2003 optimization bugs
@@ -123,6 +129,26 @@
 
 /** @} */
 
+/*===========================================================================*/
+/** @{ Code alignment                                                        */
+/*===========================================================================*/
+
+/**
+ * \def U_ALIGN_CODE
+ * This is used to align code fragments to a specific byte boundary.
+ * This is useful for getting consistent performance test results.
+ * @internal
+ */
+#ifdef U_ALIGN_CODE
+    /* Use the predefined value. */
+#elif defined(_MSC_VER) && defined(_M_IX86) && !defined(_MANAGED)
+#   define U_ALIGN_CODE(boundarySize) __asm  align boundarySize
+#else
+#   define U_ALIGN_CODE(boundarySize) 
+#endif
+
+/** @} */
+
 /*===========================================================================*/
 /** @{ Programs used by ICU code                                             */
 /*===========================================================================*/
@@ -281,6 +307,29 @@ U_INTERNAL double  U_EXPORT2 uprv_round(double x);
 /*U_INTERNAL int32_t  U_EXPORT2 uprv_digitsAfterDecimal(double x);*/
 #endif
 
+#if !U_CHARSET_IS_UTF8
+/**
+ * Please use ucnv_getDefaultName() instead.
+ * Return the default codepage for this platform and locale.
+ * This function can call setlocale() on Unix platforms. Please read the
+ * platform documentation on setlocale() before calling this function.
+ * @return the default codepage for this platform 
+ * @internal
+ */
+U_INTERNAL const char*  U_EXPORT2 uprv_getDefaultCodepage(void);
+#endif
+
+/**
+ * Please use uloc_getDefault() instead.
+ * Return the default locale ID string by querying ths system, or
+ *     zero if one cannot be found. 
+ * This function can call setlocale() on Unix platforms. Please read the
+ * platform documentation on setlocale() before calling this function.
+ * @return the default locale ID string
+ * @internal
+ */
+U_INTERNAL const char*  U_EXPORT2 uprv_getDefaultLocaleID(void);
+
 /**
  * Time zone utilities
  *

diff --git a/icu4c/source/common/ucnv_bld.cpp b/icu4c/source/common/ucnv_bld.cpp
index b3f8951c1dab6f0677e1e4f4fb4769b304b94f3b..5d3266aab93fb3e4cd3f0f7383daa97c2bc09b74 100644 (file)
--- a/icu4c/source/common/ucnv_bld.cpp
+++ b/icu4c/source/common/ucnv_bld.cpp
@@ -27,6 +27,7 @@
 #include "unicode/udata.h"
 #include "unicode/ucnv.h"
 #include "unicode/uloc.h"
+#include "putilimp.h"
 #include "utracimp.h"
 #include "ucnv_io.h"
 #include "ucnv_bld.h"

diff --git a/icu4c/source/common/ucnvbocu.cpp b/icu4c/source/common/ucnvbocu.cpp
index 9d6fe9a5bf4a2095e8308ea9724761ec06f7df67..9898f50c39939a813ac2abdfbd4b24664ecf0ef7 100644 (file)
--- a/icu4c/source/common/ucnvbocu.cpp
+++ b/icu4c/source/common/ucnvbocu.cpp
@@ -24,6 +24,7 @@
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_cb.h"
 #include "unicode/utf16.h"
+#include "putilimp.h"
 #include "ucnv_bld.h"
 #include "ucnv_cnv.h"
 

diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h
index d136ef591840cb5cd4a9a357ed2bc3e3260116be..2d2c6dace170fd7bc018635d9f243725cffda2f6 100644 (file)
--- a/icu4c/source/common/unicode/platform.h
+++ b/icu4c/source/common/unicode/platform.h
@@ -670,26 +670,6 @@
 
 /* @} */
 
-/*===========================================================================*/
-/** @{ Code alignment                                                        */
-/*===========================================================================*/
-
-/**
- * \def U_ALIGN_CODE
- * This is used to align code fragments to a specific byte boundary.
- * This is useful for getting consistent performance test results.
- * @internal
- */
-#ifdef U_ALIGN_CODE
-    /* Use the predefined value. */
-#elif defined(_MSC_VER) && defined(_M_IX86) && !defined(_MANAGED)
-#   define U_ALIGN_CODE(boundarySize) __asm  align boundarySize
-#else
-#   define U_ALIGN_CODE(boundarySize) 
-#endif
-
-/** @} */
-
 /*===========================================================================*/
 /* Custom icu entry point renaming                                           */
 /*===========================================================================*/

diff --git a/icu4c/source/common/unicode/putil.h b/icu4c/source/common/unicode/putil.h
index 5bd5983f0ab93888cb8d6112ac4dc964fd5268e2..6fc7e9cd5a62a55946ae6d7787bf25d236110a1a 100644 (file)
--- a/icu4c/source/common/unicode/putil.h
+++ b/icu4c/source/common/unicode/putil.h
@@ -30,12 +30,6 @@
   * \brief C API: Platform Utilities
   */
 
-/** Define this to 1 if your platform supports IEEE 754 floating point,
-   to 0 if it does not. */
-#ifndef IEEE_754
-#   define IEEE_754 1
-#endif
-
 /*==========================================================================*/
 /* Platform utilities                                                       */
 /*==========================================================================*/
@@ -93,29 +87,6 @@ U_STABLE const char* U_EXPORT2 u_getDataDirectory(void);
  */
 U_STABLE void U_EXPORT2 u_setDataDirectory(const char *directory);
 
-#if !U_CHARSET_IS_UTF8
-/**
- * Please use ucnv_getDefaultName() instead.
- * Return the default codepage for this platform and locale.
- * This function can call setlocale() on Unix platforms. Please read the
- * platform documentation on setlocale() before calling this function.
- * @return the default codepage for this platform 
- * @internal
- */
-U_INTERNAL const char*  U_EXPORT2 uprv_getDefaultCodepage(void);
-#endif
-
-/**
- * Please use uloc_getDefault() instead.
- * Return the default locale ID string by querying ths system, or
- *     zero if one cannot be found. 
- * This function can call setlocale() on Unix platforms. Please read the
- * platform documentation on setlocale() before calling this function.
- * @return the default locale ID string
- * @internal
- */
-U_INTERNAL const char*  U_EXPORT2 uprv_getDefaultLocaleID(void);
-
 /**
  * @{
  * Filesystem file and path separator characters.

diff --git a/icu4c/source/i18n/decContext.h b/icu4c/source/i18n/decContext.h
index c25e495e76fa13fc2bc9ebd33f10336429e0c278..78d90fd6b52ad363b175be8cf7e5d5aceeca0167 100644 (file)
--- a/icu4c/source/i18n/decContext.h
+++ b/icu4c/source/i18n/decContext.h
@@ -1,7 +1,7 @@
 /* ------------------------------------------------------------------ */
 /* Decimal Context module header                                      */
 /* ------------------------------------------------------------------ */
-/* Copyright (c) IBM Corporation, 2000-2010.   All rights reserved.   */
+/* Copyright (c) IBM Corporation, 2000-2011.   All rights reserved.   */
 /*                                                                    */
 /* This software is made available under the terms of the             */
 /* ICU License -- ICU 1.8.1 and later.                                */
@@ -28,6 +28,7 @@
  *    Remove a few compiler warnings.
  */
 #include "unicode/utypes.h"
+#include "putilimp.h"
 
 /*                                                                    */
 /* Context variables must always have valid values:                   */