cvs commit: apachen/src/os/unix os.h

[Dean Gaudet <dg...@hyperreal.org>]

dgaudet     97/10/06 22:53:43

  Modified:    src/main conf.h
               src/os/unix os.h
  Log:
  Chicken out a little bit -- why trust __inline__ and __attribute__ on
  anything earlier than gcc 2.7.x.  We don't need the support hassles.
  
  Revision  Changes    Path
  1.147     +4 -2      apachen/src/main/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- conf.h	1997/10/07 05:38:46	1.146
  +++ conf.h	1997/10/07 05:53:39	1.147
  @@ -657,13 +657,15 @@
   
   /* So that we can use inline on some critical functions, and use
    * GNUC attributes (such as to get -Wall warnings for printf-like
  - * functions).
  + * functions).  Only do this in gcc 2.7 or later ... it may work
  + * on earlier stuff, but why chance it.
    */
  -#if !defined(__GNUC__)
  +#if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 7
   #define ap_inline
   #define __attribute__(__x)
   #else
   #define ap_inline __inline__
  +#define USE_GNU_INLINE
   #endif
   
   /* Do we have sys/resource.h; assume that BSD does. */
  
  
  
  1.4       +2 -2      apachen/src/os/unix/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/os/unix/os.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- os.h	1997/09/25 01:03:28	1.3
  +++ os.h	1997/10/07 05:53:42	1.4
  @@ -4,11 +4,11 @@
    * and prototypes of OS specific functions defined in os.c or os-inline.c
    */
   
  -#if defined(__GNUC__) && !defined(INLINE)
  +#if !defined(INLINE) && defined(USE_GNU_INLINE)
   /* Compiler supports inline, so include the inlineable functions as
    * part of the header
    */
  -#define INLINE extern __inline__
  +#define INLINE extern ap_inline
   #include "os-inline.c"
   #endif