apr.h: __attribute__ and __has_attribute exist for !__GNUC__ compiler…

…s. PR 69009.

There are more compilers than __GNUC__ that provide __attribute__ so let's not
no-op it based on (un)known compilers but simply if it's not already defined
(it should be provided as a pre-defined macro if defined by the compiler).

While at, do the same for __has_attribute.

Submitted by: Petr Sumbera <petr.sumbera oracle.com>



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1917741 13f79535-47bb-0310-9956-ffa450edef68

include/apr.h.in

@@ -59,15 +59,18 @@
 #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@

include/apr.hnw

@@ -75,6 +75,9 @@ 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

include/apr.hw

@@ -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

include/apr.hwc

@@ -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