ICU-491.11.2.tar.gz

[apple/icu.git] / icuSources / common / udata.cpp

diff --git a/icuSources/common/udata.cpp b/icuSources/common/udata.cpp
index 8213beae052e367acf389b911ebfbed2f48facea..c4f8752a4ebb010ec4bf200884ea5c37a393c9fc 100644 (file)
--- a/icuSources/common/udata.cpp
+++ b/icuSources/common/udata.cpp
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
 /*
 ******************************************************************************
 *

-*   Copyright (C) 1999-2010, International Business Machines
+*   Copyright (C) 1999-2012, International Business Machines

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


@@ -14,9 +14,9 @@
 *   created by: Markus W. Scherer
 */
 
 *   created by: Markus W. Scherer
 */
 

-#include "unicode/utypes.h"  /* U_LINUX */
+#include "unicode/utypes.h"  /* U_PLATFORM etc. */

 
 

-#ifdef U_LINUX
+#ifdef __GNUC__

 /* if gcc
 #define ATTRIBUTE_WEAK __attribute__ ((weak))
 might have to #include some other header
 /* if gcc
 #define ATTRIBUTE_WEAK __attribute__ ((weak))
 might have to #include some other header


@@ -75,7 +75,7 @@ might have to #include some other header
 U_NAMESPACE_USE
 
 /*
 U_NAMESPACE_USE
 
 /*

- *  Forwards
+ *  Forward declarations

  */
 static UDataMemory *udata_findCachedData(const char *path);
 
  */
 static UDataMemory *udata_findCachedData(const char *path);
 


@@ -828,7 +828,7 @@ static UBool extendICUData(UErrorCode *pErr)
                                           /*   fields in the UDataMemory that we're assigning     */
                                           /*   to CommonICUData.                                  */
 
                                           /*   fields in the UDataMemory that we're assigning     */
                                           /*   to CommonICUData.                                  */
 

-          didUpdate =
+          didUpdate = /* no longer using this result */

               setCommonICUData(&copyPData,/*  The new common data.                                */
                        FALSE,             /*  No warnings if write didn't happen                  */
                        pErr);             /*  setCommonICUData honors errors; NOP if error set    */
               setCommonICUData(&copyPData,/*  The new common data.                                */
                        FALSE,             /*  No warnings if write didn't happen                  */
                        pErr);             /*  setCommonICUData honors errors; NOP if error set    */