cvs commit: apache-1.3/src/main http_core.c

[fielding]

fielding    99/08/09 00:29:30

  Modified:    src/main http_core.c
  Log:
  Local struct mmap conflicts with system structure name on DYNIX,
  and is pretty damn confusing anyway.  Changed to mmap_rec.
  
  PR: 4735
  
  Revision  Changes    Path
  1.271     +3 -3      apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.270
  retrieving revision 1.271
  diff -u -r1.270 -r1.271
  --- http_core.c       1999/07/03 07:59:48     1.270
  +++ http_core.c       1999/08/09 07:29:29     1.271
  @@ -2977,14 +2977,14 @@
   static int do_nothing(request_rec *r) { return OK; }
   
   #ifdef USE_MMAP_FILES
  -struct mmap {
  +struct mmap_rec {
       void *mm;
       size_t length;
   };
   
   static void mmap_cleanup(void *mmv)
   {
  -    struct mmap *mmd = mmv;
  +    struct mmap_rec *mmd = mmv;
   
       if (munmap(mmd->mm, mmd->length) == -1) {
           ap_log_error(APLOG_MARK, APLOG_ERR, NULL,
  @@ -3147,7 +3147,7 @@
   #ifdef USE_MMAP_FILES
       }
       else {
  -     struct mmap *mmd;
  +     struct mmap_rec *mmd;
   
        mmd = ap_palloc(r->pool, sizeof(*mmd));
        mmd->mm = mm;