summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2007-05-31 21:38:57 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2007-05-31 21:38:57 +0000
commit243c114704f5c5d606a561f5fd2458febb031d94 (patch)
treeab1adc4fba8756e08f25d34aeb276db7cb34ab7a
parent8191916c006e2a1df18bb5ac54fa971ebc43874a (diff)
downloadlibapr-243c114704f5c5d606a561f5fd2458febb031d94.tar.gz
Stop undefining __attribute__ for GNUC (only 2.7 and prior might be interesting
and can't think of any case where native win32 binaries would be created with such an ancient compiler.) Backport: 543219 PR: 42545 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@543269 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--include/apr.hw2
-rw-r--r--include/arch/win32/apr_private.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/include/apr.hw b/include/apr.hw
index aa47ec037..80ecb2459 100644
--- a/include/apr.hw
+++ b/include/apr.hw
@@ -113,7 +113,7 @@
#define APR_INLINE __inline
#define APR_HAS_INLINE 1
-#ifndef __attribute__
+#if !defined(__GNUC__) && !defined(__attribute__)
#define __attribute__(__x)
#endif
diff --git a/include/arch/win32/apr_private.h b/include/arch/win32/apr_private.h
index 0dc5f9896..8bf9f38b1 100644
--- a/include/arch/win32/apr_private.h
+++ b/include/arch/win32/apr_private.h
@@ -114,8 +114,6 @@
#define SIGWINCH 30
#define SIGIO 31
-#define __attribute__(__x)
-
/* APR COMPATABILITY FUNCTIONS
* This section should be used to define functions and
* macros which are need to make Windows features look