Revert r1917741:1917742.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1917745 13f79535-47bb-0310-9956-ffa450edef68
apache · May 15, 2024 · ab76f3c · ab76f3c
1 parent 7547c60
commit ab76f3c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/include/apr.h.in b/include/apr.h.in
@@ -47,7 +47,7 @@
 
 /* So that we can use inline on some critical functions, and use
  * GNUC attributes (such as to get -Wall warnings for printf-like
- * functions).  __inline__ exists in gcc 2.7 or later ... it may work
+ * functions).  Only do this in gcc 2.7 or later ... it may work
  * on earlier stuff, but why chance it.
  *
  * We've since discovered that the gcc shipped with NeXT systems
@@ -59,18 +59,15 @@
 #if !defined(__GNUC__) || __GNUC__ < 2 || \
     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
     defined(NEXT)
+#ifndef __attribute__
+#define __attribute__(__x)
+#endif
 #define APR_INLINE
 #define APR_HAS_INLINE          0
 #else
 #define APR_INLINE __inline__
 #define APR_HAS_INLINE          1
 #endif
-#ifndef __has_attribute
-#define __has_attribute(__x)    0
-#endif
-#ifndef __attribute__
-#define __attribute__(__x)
-#endif
 
 #define APR_HAVE_ARPA_INET_H     @arpa_ineth@
 #define APR_HAVE_CONIO_H         @conioh@

diff --git a/include/apr.hnw b/include/apr.hnw
@@ -75,9 +75,6 @@ extern "C" {
 
 #define APR_INLINE
 #define APR_HAS_INLINE                  0
-#ifndef __has_attribute
-#define __has_attribute(__x)            0
-#endif
 #ifndef __attribute__
 #define __attribute__(__x)
 #endif

diff --git a/include/apr.hw b/include/apr.hw
@@ -95,7 +95,7 @@
 
 /* So that we can use inline on some critical functions, and use
  * GNUC attributes (such as to get -Wall warnings for printf-like
- * functions).  __inline__ exists in gcc 2.7 or later ... it may work
+ * functions).  Only do this in gcc 2.7 or later ... it may work
  * on earlier stuff, but why chance it.
  *
  * We've since discovered that the gcc shipped with NeXT systems
@@ -107,21 +107,21 @@
 #if defined(_MSC_VER)
 #define APR_INLINE __inline
 #define APR_HAS_INLINE          1
+#ifndef __attribute__
+#define __attribute__(__x)
+#endif
 #elif !defined(__GNUC__) || __GNUC__ < 2 || \
     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
     defined(NEXT)
+#ifndef __attribute__
+#define __attribute__(__x)
+#endif
 #define APR_INLINE
 #define APR_HAS_INLINE          0
 #else
 #define APR_INLINE __inline__
 #define APR_HAS_INLINE          1
 #endif
-#ifndef __has_attribute
-#define __has_attribute(__x)    0
-#endif
-#ifndef __attribute__
-#define __attribute__(__x)
-#endif
 
 #define APR_HAVE_ARPA_INET_H    0
 #define APR_HAVE_CONIO_H        1

diff --git a/include/apr.hwc b/include/apr.hwc
@@ -85,7 +85,7 @@
 
 /* So that we can use inline on some critical functions, and use
  * GNUC attributes (such as to get -Wall warnings for printf-like
- * functions).  __inline__ exists in gcc 2.7 or later ... it may work
+ * functions).  Only do this in gcc 2.7 or later ... it may work
  * on earlier stuff, but why chance it.
  *
  * We've since discovered that the gcc shipped with NeXT systems
@@ -97,21 +97,21 @@
 #if defined(_MSC_VER)
 #define APR_INLINE __inline
 #define APR_HAS_INLINE          1
+#ifndef __attribute__
+#define __attribute__(__x)
+#endif
 #elif !defined(__GNUC__) || __GNUC__ < 2 || \
     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
     defined(NEXT)
+#ifndef __attribute__
+#define __attribute__(__x)
+#endif
 #define APR_INLINE
 #define APR_HAS_INLINE          0
 #else
 #define APR_INLINE __inline__
 #define APR_HAS_INLINE          1
 #endif
-#ifndef __has_attribute
-#define __has_attribute(__x)    0
-#endif
-#ifndef __attribute__
-#define __attribute__(__x)
-#endif
 
 #define APR_HAVE_ARPA_INET_H    0
 #define APR_HAVE_CONIO_H        1