ICU-22053 Clean up usages of Macro Header Guards

diff --git a/icu4c/source/common/bytesinkutil.h b/icu4c/source/common/bytesinkutil.h
index ab2516432d31118358159b92ae14c6ce9e5b6b40..929c71fbee6bc7958d1b8b0b56214d13dded659c 100644 (file)
--- a/icu4c/source/common/bytesinkutil.h
+++ b/icu4c/source/common/bytesinkutil.h
@@ -4,6 +4,9 @@
 // bytesinkutil.h
 // created: 2017sep14 Markus W. Scherer
 
+#ifndef BYTESINKUTIL_H
+#define BYTESINKUTIL_H
+
 #include "unicode/utypes.h"
 #include "unicode/bytestream.h"
 #include "unicode/edits.h"
@@ -81,3 +84,5 @@ private:
 };
 
 U_NAMESPACE_END
+
+#endif //BYTESINKUTIL_H

diff --git a/icu4c/source/i18n/vzone.h b/icu4c/source/i18n/vzone.h
index d1b6d8d820457c7cc76c7f066e5c3b21ffc95c2e..bf9b45ea20d7ecf61117e06b9d3a3b6aba51ebd8 100644 (file)
--- a/icu4c/source/i18n/vzone.h
+++ b/icu4c/source/i18n/vzone.h
@@ -24,14 +24,12 @@
 #include "unicode/uobject.h"
 #include "ztrans.h"
 
-#ifndef UCNV_H
 struct VZone;
 /**
  * A UnicodeSet.  Use the vzone_* API to manipulate.  Create with
  * vzone_open*, and destroy with vzone_close.
  */
 typedef struct VZone VZone;
-#endif
 
 /*********************************************************************
  * VZone API

diff --git a/icu4c/source/i18n/zrule.h b/icu4c/source/i18n/zrule.h
index f395ad4c3f3176589fa9e324d544e75863a0eefa..2bea64c6d4fe37618a343c65e19fa55aa538c939 100644 (file)
--- a/icu4c/source/i18n/zrule.h
+++ b/icu4c/source/i18n/zrule.h
@@ -20,8 +20,6 @@
 
 #include "unicode/uobject.h"
 
-#ifndef UCNV_H
-
 /**
  * A TimeZoneRule.  Use the zrule_* API to manipulate.  Create with
  * zrule_open*, and destroy with zrule_close.
@@ -43,8 +41,6 @@ typedef struct IZRule IZRule;
 struct AZRule;
 typedef struct AZRule AZRule;
 
-#endif
-
 /*********************************************************************
  * ZRule API
  *********************************************************************/

diff --git a/icu4c/source/i18n/ztrans.h b/icu4c/source/i18n/ztrans.h
index b23bb4fc706e69e4495e437e8a562fdc6a31dcd7..a1f39100557159b815e8b8a5fa6d18f366e340a0 100644 (file)
--- a/icu4c/source/i18n/ztrans.h
+++ b/icu4c/source/i18n/ztrans.h
@@ -20,8 +20,6 @@
 
 #include "unicode/uobject.h"
 
-#ifndef UCNV_H
-
 /**
  * A TimeZoneTransition.  Use the ztrans_* API to manipulate.  Create with
  * ztrans_open*, and destroy with ztrans_close.
@@ -29,8 +27,6 @@
 struct ZTrans;
 typedef struct ZTrans ZTrans;
 
-#endif
-
 /**
  * Constructs a time zone transition with the time and the rules before/after
  * the transition.