diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2003-03-23 02:25:02 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2003-03-23 02:25:02 +0000 |
| commit | cbb40d004d0fc3d3c27282891208d914cc141df3 (patch) | |
| tree | 3def360a4eeb536407274eb841bc03314017de6e | |
| parent | e30089f604162d81e77cb8ab8563fbd7331dd5b6 (diff) | |
| download | libapr-cbb40d004d0fc3d3c27282891208d914cc141df3.tar.gz | |
Fix for multiple fixes to __attribute__ which conflicts for 3rd party
builds, such as mod_perl. Let's only override this tag if a macro
workaround wasn't already defined.
Submitted by: Stas Bekman
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64446 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/apr.h.in | 4 | ||||
| -rw-r--r-- | include/apr.hnw | 2 | ||||
| -rw-r--r-- | include/apr.hw | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/apr.h.in b/include/apr.h.in index 4947ddd4e..cb223859c 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -96,8 +96,10 @@ #if !defined(__GNUC__) || __GNUC__ < 2 || \ (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\ defined(NEXT) -#define APR_INLINE +#ifndef __attribute__ #define __attribute__(__x) +#endif +#define APR_INLINE #define APR_HAS_INLINE 0 #else #define APR_INLINE __inline__ diff --git a/include/apr.hnw b/include/apr.hnw index 7c3eb6745..6af0bb013 100644 --- a/include/apr.hnw +++ b/include/apr.hnw @@ -112,7 +112,9 @@ extern "C" { #define APR_INLINE #define APR_HAS_INLINE 0 +#ifndef __attribute__ #define __attribute__(__x) +#endif #define ENUM_BITFIELD(e,n,w) signed int n : w #define APR_HAVE_ARPA_INET_H 0 diff --git a/include/apr.hw b/include/apr.hw index 78d3176d8..8f1946942 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -139,7 +139,9 @@ #define APR_INLINE __inline #define APR_HAS_INLINE 1 +#ifndef __attribute__ #define __attribute__(__x) +#endif #define NO_USE_SIGACTION |