httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@hyperreal.org
Subject cvs commit: apache-1.3/src/include ap_config.h
Date Sat, 12 Dec 1998 02:53:43 GMT
fielding    98/12/11 18:53:42

  Modified:    src      CHANGES
               src/include ap_config.h
  Log:
  Fix ordering of definitions in ap_config.h so that ap_inline is
  defined before it might be used.
  
  Submitted by:	Victor Khimenko <apache-devel@khim.sch57.msk.ru>
  Reviewed by:	Roy Fielding, Dean Gaudet
  
  Revision  Changes    Path
  1.1166    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1165
  retrieving revision 1.1166
  diff -u -r1.1165 -r1.1166
  --- CHANGES	1998/12/06 16:14:16	1.1165
  +++ CHANGES	1998/12/12 02:53:40	1.1166
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.4
   
  +  *) Fix ordering of definitions in ap_config.h so that ap_inline is
  +     defined before it might be used. [Khimenko Victor]
  +
     *) PORT: Add Dynamic Shared Object (DSO) support for BSDI (v4.0).
        [Tom Serkowski <tks@bsdi.com>] PR#3453
   
  
  
  
  1.245     +21 -21    apache-1.3/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
  retrieving revision 1.244
  retrieving revision 1.245
  diff -u -r1.244 -r1.245
  --- ap_config.h	1998/11/06 22:42:41	1.244
  +++ ap_config.h	1998/12/12 02:53:42	1.245
  @@ -84,6 +84,27 @@
   #include <sys/types.h>
   #include <sys/stat.h>
   
  +/* 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_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
  +
   #ifdef WIN32
   /* include process.h first so we can override spawn[lv]e* properly */
   #include <process.h>
  @@ -888,27 +909,6 @@
   #define ap_private_extern __private_extern__
   #else
   #define ap_private_extern
  -#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_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
   
   /*
  
  
  

Mime
View raw message