cvs commit: apache-1.2/src CHANGES mod_include.c

[dgaudet]

dgaudet     98/02/21 03:44:11

  Modified:    src      CHANGES mod_include.c
  Log:
  Work around a broken cpp.
  
  PR:           1717
  
  Revision  Changes    Path
  1.297     +5 -0      apache-1.2/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
  retrieving revision 1.296
  retrieving revision 1.297
  diff -u -r1.296 -r1.297
  --- CHANGES   1998/02/17 01:45:57     1.296
  +++ CHANGES   1998/02/21 11:44:08     1.297
  @@ -1,3 +1,8 @@
  +Changes with Apache 1.2.7
  +
  +  *) Work around a broken C preprocessor in mod_include.
  +     [Dean Gaudet] PR#1717
  +
   Changes with Apache 1.2.6
   
     *) Increase the robustness of the child_main loop.  When unexpected
  
  
  
  1.37      +3 -1      apache-1.2/src/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.2/src/mod_include.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- mod_include.c     1998/02/03 10:00:49     1.36
  +++ mod_include.c     1998/02/21 11:44:09     1.37
  @@ -1023,9 +1023,11 @@
                   }
                   else {
                       int l, x;
  -#if defined(BSD) && BSD > 199305
  +#if defined(BSD)
  +#if BSD > 199305
                       /* ap_snprintf can't handle %qd */
                       sprintf(tag, "%qd", finfo.st_size);
  +#endif
   #else
                       ap_snprintf(tag, sizeof(tag), "%ld", finfo.st_size);
   #endif