From fed0faa1c67e1393a98b874d2534fa7ae3b951c6 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 10 Jan 2013 16:44:59 +0000
Subject: Remove __GNUC__ conditions for "long long" from string.h and wchar.h.

---
 wcsmbs/wchar.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'wcsmbs/wchar.h')

diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 75e2dea..e915586 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -475,7 +475,7 @@ extern unsigned long int wcstoul (const wchar_t *__restrict __nptr,
      __THROW;
 __END_NAMESPACE_STD
 
-#if defined __USE_ISOC99 || (defined __GNUC__ && defined __USE_GNU)
+#ifdef __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Convert initial portion of wide string NPTR to `long long int'
    representation.  */
@@ -491,9 +491,9 @@ extern unsigned long long int wcstoull (const wchar_t *__restrict __nptr,
 					wchar_t **__restrict __endptr,
 					int __base) __THROW;
 __END_NAMESPACE_C99
-#endif /* ISO C99 or GCC and GNU.  */
+#endif /* ISO C99.  */
 
-#if defined __GNUC__ && defined __USE_GNU
+#ifdef __USE_GNU
 /* Convert initial portion of wide string NPTR to `long long int'
    representation.  */
 __extension__
@@ -507,7 +507,7 @@ __extension__
 extern unsigned long long int wcstouq (const wchar_t *__restrict __nptr,
 				       wchar_t **__restrict __endptr,
 				       int __base) __THROW;
-#endif /* GCC and use GNU.  */
+#endif /* Use GNU.  */
 
 #ifdef __USE_GNU
 /* The concept of one static locale per category is not very well
-- 
cgit v1.1