ICU-491.11.2.tar.gz

[apple/icu.git] / icuSources / layout / LETypes.h

diff --git a/icuSources/layout/LETypes.h b/icuSources/layout/LETypes.h
index 400d016e4a41792bec93984b245237ec303e00da..0540493bd26e581f9013d5f222fe1b4200432726 100644 (file)
--- a/icuSources/layout/LETypes.h
+++ b/icuSources/layout/LETypes.h
@@ -1,6 +1,6 @@
 /*
  *
- * (C) Copyright IBM Corp. 1998-2009 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved
  *
  */
 
@@ -13,7 +13,7 @@
 
 #include "unicode/utypes.h"
 
-#ifdef XP_CPLUSPLUS
+#ifdef __cplusplus
 #include "unicode/uobject.h"
 #endif
 
@@ -229,12 +229,14 @@ typedef UChar LEUnicode16;
  */
 typedef UChar32 LEUnicode32;
 
+#ifndef U_HIDE_DEPRECATED_API
 /**
  * Used to represent 16-bit Unicode code points.
  *
  * @deprecated since ICU 2.4. Use LEUnicode16 instead
  */
 typedef UChar LEUnicode;
+#endif  /* U_HIDE_DEPRECATED_API */
 
 /**
  * Used to hold a pair of (x, y) values which represent a point.
@@ -258,7 +260,7 @@ struct LEPoint
     float fY;
 };
 
-#ifndef XP_CPLUSPLUS
+#ifndef __cplusplus
 /**
  * Used to hold a pair of (x, y) values which represent a point.
  *
@@ -268,6 +270,7 @@ typedef struct LEPoint LEPoint;
 #endif
 
 
+#ifndef U_HIDE_INTERNAL_API
 /**
  * A convenience macro to get the length of an array.
  *
@@ -307,6 +310,7 @@ typedef struct LEPoint LEPoint;
  */
 #define LE_DELETE_ARRAY(array) uprv_free((void *) (array))
 #endif
+#endif  /* U_HIDE_INTERNAL_API */
 
 /**
  * A macro to construct the four-letter tags used to
@@ -542,7 +546,7 @@ enum LEErrorCode {
     LE_MISSING_FONT_TABLE_ERROR     = U_MISSING_RESOURCE_ERROR   /**< The requested font table does not exist. */
 };
 
-#ifndef XP_CPLUSPLUS
+#ifndef __cplusplus
 /**
  * Error codes returned by the LayoutEngine.
  *