httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Thu, 04 Jan 2001 20:45:13 GMT
trawick     01/01/04 12:45:12

  Modified:    modules/filters mod_include.c
  Log:
  Get rid of some warnings on Tru64 and OS/390.  void * isn't compatible
  with function pointers.
  
  Revision  Changes    Path
  1.83      +5 -2      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- mod_include.c	2000/12/07 03:32:54	1.82
  +++ mod_include.c	2001/01/04 20:45:06	1.83
  @@ -2776,7 +2776,10 @@
               ctx->combined_tag[ctx->directive_length] = '\0';
               ctx->curr_tag_pos = &ctx->combined_tag[ctx->directive_length+1];
   
  -            handle_func = apr_hash_get(include_hash, ctx->combined_tag, ctx->directive_length+1);
  +            handle_func = 
  +                (int (*)(include_ctx_t *, ap_bucket_brigade **, request_rec *,
  +                    ap_filter_t *, ap_bucket *, ap_bucket **))
  +                apr_hash_get(include_hash, ctx->combined_tag, ctx->directive_length+1);
               if (handle_func != NULL) {
                   ret = (*handle_func)(ctx, bb, r, f, dptr, &content_head);
               }
  @@ -3030,7 +3033,7 @@
   
   void ap_register_include_handler(char *tag, handler func)
   {
  -    apr_hash_set(include_hash, tag, strlen(tag) + 1, func);
  +    apr_hash_set(include_hash, tag, strlen(tag) + 1, (const void *)func);
   }
   
   static void include_post_config(apr_pool_t *p, apr_pool_t *plog,
  
  
  

Mime
View raw message