--- a/js/src/builtin/Intl.cpp
+++ b/js/src/builtin/Intl.cpp
@@ -68,33 +68,33 @@ SUPPRESS_UNUSED_WARNING static int32_t
 u_strlen(const UChar *s)
 {
     MOZ_NOT_REACHED("u_strlen: Intl API disabled");
     return 0;
 }
 
 struct UEnumeration;
 
-SUPPRESS_UNUSED_WARNING static int32_t
+static int32_t
 uenum_count(UEnumeration *en, UErrorCode *status)
 {
     MOZ_NOT_REACHED("uenum_count: Intl API disabled");
     *status = U_UNSUPPORTED_ERROR;
     return 0;
 }
 
-SUPPRESS_UNUSED_WARNING static const char *
+static const char *
 uenum_next(UEnumeration *en, int32_t *resultLength, UErrorCode *status)
 {
     MOZ_NOT_REACHED("uenum_next: Intl API disabled");
     *status = U_UNSUPPORTED_ERROR;
     return NULL;
 }
 
-SUPPRESS_UNUSED_WARNING static void
+static void
 uenum_close(UEnumeration *en)
 {
     MOZ_NOT_REACHED("uenum_close: Intl API disabled");
 }
 
 struct UCollator;
 
 enum UColAttribute {
@@ -119,60 +119,60 @@ enum UColAttributeValue {
 };
 
 enum UCollationResult {
   UCOL_EQUAL = 0,
   UCOL_GREATER = 1,
   UCOL_LESS = -1
 };
 
-SUPPRESS_UNUSED_WARNING static int32_t
+static int32_t
 ucol_countAvailable(void)
 {
     MOZ_NOT_REACHED("ucol_countAvailable: Intl API disabled");
     return 0;
 }
 
-SUPPRESS_UNUSED_WARNING static const char *
+static const char *
 ucol_getAvailable(int32_t localeIndex)
 {
     MOZ_NOT_REACHED("ucol_getAvailable: Intl API disabled");
     return NULL;
 }
 
-SUPPRESS_UNUSED_WARNING static UCollator *
+static UCollator *
 ucol_open(const char *loc, UErrorCode *status)
 {
     MOZ_NOT_REACHED("ucol_open: Intl API disabled");
     *status = U_UNSUPPORTED_ERROR;
     return NULL;
 }
 
-SUPPRESS_UNUSED_WARNING static void
+static void
 ucol_setAttribute(UCollator *coll, UColAttribute attr, UColAttributeValue value, UErrorCode *status)
 {
     MOZ_NOT_REACHED("ucol_setAttribute: Intl API disabled");
     *status = U_UNSUPPORTED_ERROR;
 }
 
-SUPPRESS_UNUSED_WARNING static UCollationResult
+static UCollationResult
 ucol_strcoll(const UCollator *coll, const UChar *source, int32_t sourceLength,
              const UChar *target, int32_t targetLength)
 {
     MOZ_NOT_REACHED("ucol_strcoll: Intl API disabled");
     return (UCollationResult) 0;
 }
 
-SUPPRESS_UNUSED_WARNING static void
+static void
 ucol_close(UCollator *coll)
 {
     MOZ_NOT_REACHED("ucol_close: Intl API disabled");
 }
 
-SUPPRESS_UNUSED_WARNING static UEnumeration *
+static UEnumeration *
 ucol_getKeywordValuesForLocale(const char *key, const char *locale, UBool commonlyUsed,
                                UErrorCode *status)
 {
     MOZ_NOT_REACHED("ucol_getKeywordValuesForLocale: Intl API disabled");
     *status = U_UNSUPPORTED_ERROR;
     return NULL;
 }