diff options
| -rw-r--r-- | include/apr.h.in | 7 | ||||
| -rw-r--r-- | include/apr.hw | 3 | ||||
| -rw-r--r-- | include/apr_general.h | 9 |
3 files changed, 6 insertions, 13 deletions
diff --git a/include/apr.h.in b/include/apr.h.in index 1cbddd728..7720d35d0 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -15,11 +15,12 @@ #if !defined(__GNUC__) || __GNUC__ < 2 || \ (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\ defined(NEXT) -#define apr_inline +#define APR_INLINE #define __attribute__(__x) +#define APR_HAS_INLINE 0 #else -#define apr_inline __inline__ -#define USE_GNU_INLINE +#define APR_INLINE __inline__ +#define APR_HAS_INLINE 1 #endif #define APR_HAVE_ARPA_INET_H @arpa_ineth@ diff --git a/include/apr.hw b/include/apr.hw index ff22e3e0c..bdb105cc9 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -108,7 +108,8 @@ #include <process.h> #include <stdlib.h> -#define apr_inline +#define APR_INLINE __inline +#define APR_HAS_INLINE 1 #define __attribute__(__x) #define NO_USE_SIGACTION diff --git a/include/apr_general.h b/include/apr_general.h index 33d0a8060..820ce5080 100644 --- a/include/apr_general.h +++ b/include/apr_general.h @@ -78,15 +78,6 @@ extern "C" { typedef int apr_signum_t; -#ifdef WIN32 -#define APR_INLINE __inline -#elif defined(__GNUC__) && defined(__GNUC__) && \ - __GNUC__ >= 2 && __GNUC_MINOR__ >= 7 -#define APR_INLINE __inline__ -#else -#define APR_INLINE /*nop*/ -#endif - /* Finding offsets of elements within structures. * Taken from the X code... they've sweated portability of this stuff * so we don't have to. Sigh... |