apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/include apr.h.in apr.hnw apr.hw
Date Sun, 23 Mar 2003 02:25:02 GMT
wrowe       2003/03/22 18:25:02

  Modified:    include  apr.h.in apr.hnw apr.hw
  Log:
    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
  
  Revision  Changes    Path
  1.122     +3 -1      apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.h.in,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- apr.h.in	18 Mar 2003 23:10:14 -0000	1.121
  +++ apr.h.in	23 Mar 2003 02:25:02 -0000	1.122
  @@ -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__
  
  
  
  1.33      +2 -0      apr/include/apr.hnw
  
  Index: apr.hnw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hnw,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- apr.hnw	18 Mar 2003 23:10:14 -0000	1.32
  +++ apr.hnw	23 Mar 2003 02:25:02 -0000	1.33
  @@ -112,7 +112,9 @@
   
   #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
  
  
  
  1.113     +2 -0      apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hw,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- apr.hw	18 Mar 2003 23:10:14 -0000	1.112
  +++ apr.hw	23 Mar 2003 02:25:02 -0000	1.113
  @@ -139,7 +139,9 @@
   
   #define APR_INLINE __inline
   #define APR_HAS_INLINE          1
  +#ifndef __attribute__
   #define __attribute__(__x)
  +#endif
   
   #define NO_USE_SIGACTION
   
  
  
  

Mime
View raw message