rbb 99/08/18 13:33:30
Modified: mpm/src/lib/apr/include apr_config.h.in mpm/src/lib/apr/lib apr_pools.c Log: Two more changes for AIX. One defines the __attributes__ directive for non-gcc compilers and remove a warning on picky compilers. Revision Changes Path 1.3 +23 -0 apache-2.0/mpm/src/lib/apr/include/apr_config.h.in Index: apr_config.h.in =================================================================== RCS file: /export/home/cvs/apache-2.0/mpm/src/lib/apr/include/apr_config.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apr_config.h.in 1999/08/18 13:33:26 1.2 +++ apr_config.h.in 1999/08/18 20:33:28 1.3 @@ -9,6 +9,29 @@ #undef _ALL_SOURCE #endif +/* So that we can use inline on some critical functions, and use + * GNUC attributes (such as to get -Wall warnings for printf-like + * functions). Only do this in gcc 2.7 or later ... it may work + * on earlier stuff, but why chance it. + * + * We've since discovered that the gcc shipped with NeXT systems + * as "cc" is completely broken. It claims to be __GNUC__ and so + * on, but it doesn't implement half of the things that __GNUC__ + * means. In particular it's missing inline and the __attribute__ + * stuff. So we hack around it. PR#1613. -djg + */ +#if !defined(__GNUC__) || __GNUC__ < 2 || \ + (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\ + defined(NEXT) +#define ap_inline +#define __attribute__(__x) +#define ENUM_BITFIELD(e,n,w) signed int n : w +#else +#define ap_inline __inline__ +#define USE_GNU_INLINE +#define ENUM_BITFIELD(e,n,w) e n : w +#endif + /* Define to empty if the keyword does not work. */ #undef const 1.3 +0 -1 apache-2.0/mpm/src/lib/apr/lib/apr_pools.c Index: apr_pools.c =================================================================== RCS file: /export/home/cvs/apache-2.0/mpm/src/lib/apr/lib/apr_pools.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apr_pools.c 1999/08/18 13:33:27 1.2 +++ apr_pools.c 1999/08/18 20:33:29 1.3 @@ -1214,7 +1214,6 @@ * since fclose() would flush I/O buffers, which is extremely undesirable; * we just close the descriptor. */ -/* static void file_cleanup(void *fpv) { fclose((FILE *) fpv);