ICU-461.12.tar.gz

[apple/icu.git] / icuSources / common / unicode / uconfig.h

diff --git a/icuSources/common/unicode/uconfig.h b/icuSources/common/unicode/uconfig.h
index 8dea2ab8c4d170d05a4c31346e6bc6e2ef3a9191..6521eed472d792e4a4c8ef6a2da52a0134004561 100644 (file)
--- a/icuSources/common/unicode/uconfig.h
+++ b/icuSources/common/unicode/uconfig.h
@@ -1,6 +1,6 @@
 /*  
 **********************************************************************
-*   Copyright (C) 2002-2006, International Business Machines
+*   Copyright (C) 2002-2009, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  uconfig.h
@@ -15,6 +15,7 @@
 #ifndef __UCONFIG_H__
 #define __UCONFIG_H__
 
+
 /*!
  * \file
  * \brief Switches for excluding parts of ICU library code modules.
@@ -34,6 +35,17 @@
  * @stable ICU 2.4
  */
 
+/**
+ * If this switch is defined, ICU will attempt to load a header file named "uconfig_local.h"
+ * prior to determining default settings for uconfig variables.
+ * 
+ * @internal ICU 4.0
+ * 
+ */
+#if defined(UCONFIG_USE_LOCAL)
+#include "uconfig_local.h"
+#endif
+
 /**
  * \def UCONFIG_ONLY_COLLATION
  * This switch turns off modules that are not needed for collation.
@@ -81,7 +93,7 @@
  * File access cannot be turned off for the icuio library or for the ICU
  * test suites and ICU tools.
  *
- * @draft ICU 3.6
+ * @stable ICU 3.6
  */
 #ifndef UCONFIG_NO_FILE_IO
 #   define UCONFIG_NO_FILE_IO 0
@@ -92,7 +104,11 @@
  * ICU will not completely build with this switch turned on.
  * This switch turns off all converters.
  *
+ * You may want to use this together with U_CHARSET_IS_UTF8 defined to 1
+ * in utypes.h if char* strings in your environment are always in UTF-8.
+ *
  * @stable ICU 3.2
+ * @see U_CHARSET_IS_UTF8
  */
 #ifndef UCONFIG_NO_CONVERSION
 #   define UCONFIG_NO_CONVERSION 0