Fri Nov 28 10:59:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 74 insertions, 34 deletions

diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h
index b30d68a56be..21c91b3699b 100644
--- a/ACE/ace/Basic_Types.h
+++ b/ACE/ace/Basic_Types.h
@@ -707,94 +707,134 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #   define ACE_INT64_LITERAL(n) n ## ll
 # endif /* ! ACE_WIN32  &&  ! ACE_LACKS_LONGLONG_T */
 
-#if !defined (ACE_INT8_FORMAT_SPECIFIER)
+#if !defined (ACE_INT8_FORMAT_SPECIFIER_ASCII)
 #  if defined (PRId8)
-#    define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId8)
+#    define ACE_INT8_FORMAT_SPECIFIER_ASCII "%" PRId8
 #  else
-#    define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT ("%d")
+#    define ACE_INT8_FORMAT_SPECIFIER_ASCII "%d"
 #  endif /* defined (PRId8) */
+#endif /* ACE_INT8_FORMAT_SPECIFIER_ASCII */
+
+#if !defined (ACE_INT8_FORMAT_SPECIFIER)
+# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT (ACE_INT8_FORMAT_SPECIFIER)
 #endif /* ACE_INT8_FORMAT_SPECIFIER */
 
-#if !defined (ACE_UINT8_FORMAT_SPECIFIER)
+#if !defined (ACE_UINT8_FORMAT_SPECIFIER_ASCII)
 #  if defined (PRIu8)
-#    define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu8)
+#    define ACE_UINT8_FORMAT_SPECIFIER_ASCII "%" PRIu8
 #  else
-#    define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT ("%u")
+#    define ACE_UINT8_FORMAT_SPECIFIER_ASCII "%u"
 #  endif /* defined (PRIu8) */
 #endif /* ACE_UINT8_FORMAT_SPECIFIER */
 
-#if !defined (ACE_INT16_FORMAT_SPECIFIER)
+#if !defined (ACE_UINT8_FORMAT_SPECIFIER)
+#define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT8_FORMAT_SPECIFIER_ASCII)
+#endif /* ACE_UINT8_FORMAT_SPECIFIER */
+
+#if !defined (ACE_INT16_FORMAT_SPECIFIER_ASCII)
 #  if defined (PRId16)
-#    define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId16)
+#    define ACE_INT16_FORMAT_SPECIFIER_ASCII "%" PRId16
 #  else
-#    define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT ("%d")
+#    define ACE_INT16_FORMAT_SPECIFIER_ASCII "%d"
 #  endif /* defined (PRId16) */
 #endif /* ACE_INT16_FORMAT_SPECIFIER */
 
-#if !defined (ACE_UINT16_FORMAT_SPECIFIER)
+#if !defined (ACE_INT16_FORMAT_SPECIFIER)
+#define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT (ACE_INT16_FORMAT_SPECIFIER_ASCII)
+#endif /* ACE_INT16_FORMAT_SPECIFIER */
+
+#if !defined (ACE_UINT16_FORMAT_SPECIFIER_ASCII)
 #  if defined (PRIu16)
-#    define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu16)
+#    define ACE_UINT16_FORMAT_SPECIFIER_ASCII "%" PRIu16
 #  else
-#    define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT ("%u")
+#    define ACE_UINT16_FORMAT_SPECIFIER_ASCII "%u"
 #  endif /* defined (PRIu16) */
 #endif /* ACE_UINT16_FORMAT_SPECIFIER */
 
-#if !defined (ACE_INT32_FORMAT_SPECIFIER)
+#if !defined (ACE_UINT16_FORMAT_SPECIFIER)
+#define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT16_FORMAT_SPECIFIER_ASCII)
+#endif /* ACE_UINT16_FORMAT_SPECIFIER */
+
+#if !defined (ACE_INT32_FORMAT_SPECIFIER_ASCII)
 #  if defined (PRId32)
-#    define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId32)
+#    define ACE_INT32_FORMAT_SPECIFIER_ASCII "%" PRId32
 #  elif ACE_SIZEOF_INT == 4
-#    define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%d")
+#    define ACE_INT32_FORMAT_SPECIFIER_ASCII "%d"
 #  else
-#    define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%ld")
+#    define ACE_INT32_FORMAT_SPECIFIER_ASCII "%ld"
 #  endif /* defined (PRId32) */
 #endif /* ACE_INT32_FORMAT_SPECIFIER */
 
-#if !defined (ACE_UINT32_FORMAT_SPECIFIER)
+#if !defined (ACE_INT32_FORMAT_SPECIFIER)
+#define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT (ACE_INT32_FORMAT_SPECIFIER_ASCII)
+#endif /* ACE_INT32_FORMAT_SPECIFIER */
+
+#if !defined (ACE_UINT32_FORMAT_SPECIFIER_ASCII)
 #  if defined (PRIu32)
-#    define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu32)
+#    define ACE_UINT32_FORMAT_SPECIFIER_ASCII "%" PRIu32
 #  elif ACE_SIZEOF_INT == 4
-#    define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%u")
+#    define ACE_UINT32_FORMAT_SPECIFIER_ASCII "%u"
 #  else
-#    define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%lu")
+#    define ACE_UINT32_FORMAT_SPECIFIER_ASCII "%lu"
 #  endif /* defined (PRIu32) */
 #endif /* ACE_UINT32_FORMAT_SPECIFIER */
 
-#if !defined (ACE_INT64_FORMAT_SPECIFIER)
+#if !defined (ACE_UINT32_FORMAT_SPECIFIER)
+#define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT32_FORMAT_SPECIFIER_ASCII)
+#endif /* ACE_UINT32_FORMAT_SPECIFIER */
+
+#if !defined (ACE_INT64_FORMAT_SPECIFIER_ASCII)
 #  if defined (PRId64)
-#    define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId64)
+#    define ACE_INT64_FORMAT_SPECIFIER_ASCII "%" PRId64
 #  elif ACE_SIZEOF_LONG == 8
-#    define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%ld")
+#    define ACE_INT64_FORMAT_SPECIFIER_ASCII "%ld"
 #  else
-#    define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%lld")
+#    define ACE_INT64_FORMAT_SPECIFIER_ASCII "%lld"
 #  endif /* defined (PRId64) */
 #endif /* ACE_INT64_FORMAT_SPECIFIER */
 
-#if !defined (ACE_UINT64_FORMAT_SPECIFIER)
+#if !defined (ACE_INT64_FORMAT_SPECIFIER)
+#define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT (ACE_INT64_FORMAT_SPECIFIER_ASCII)
+#endif /* ACE_INT64_FORMAT_SPECIFIER */
+
+#if !defined (ACE_UINT64_FORMAT_SPECIFIER_ASCII)
 #  if defined (PRIu64)
-#    define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu64)
+#    define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%" PRIu64
 #  elif ACE_SIZEOF_LONG == 8
-#    define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%lu")
+#    define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu"
 #  else
-#    define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%llu")
+#    define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%llu"
 #  endif /* defined (PRIu64) */
+#endif /* ACE_UINT64_FORMAT_SPECIFIER_ASCII */
+
+#if !defined (ACE_UINT64_FORMAT_SPECIFIER)
+#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT64_FORMAT_SPECIFIER_ASCII)
 #endif /* ACE_UINT64_FORMAT_SPECIFIER */
 
-#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER)
+#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII)
 # if defined (ACE_WIN64)
-#  define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%I64d")
+#  define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%I64d"
 # else
-#  define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%d")
+#  define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%d"
 # endif /* ACE_WIN64 */
 #endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */
 
-#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER)
+#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER)
+#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII)
+#endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */
+
+#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER_ASCII)
 # if defined (ACE_WIN64)
-#  define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%I64u")
+#  define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%I64u"
 # else
-#  define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%u")
+#  define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%u"
 # endif /* ACE_WIN64 */
 #endif /* ACE_SIZE_T_FORMAT_SPECIFIER */
 
+#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER)
+#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_ASCII)
+#endif /* ACE_SIZE_T_FORMAT_SPECIFIER */
+
 // Cast from UINT64 to a double requires an intermediate cast to INT64
 // on some platforms.
 # if defined (ACE_LACKS_LONGLONG_T)