httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From orlikow...@apache.org
Subject cvs commit: httpd-2.0/include http_config.h
Date Fri, 11 May 2001 18:21:43 GMT
orlikowski    01/05/11 11:21:43

  Modified:    include  http_config.h
  Log:
  Fix up some of the definitions, based on Ian's patch.
  
  Revision  Changes    Path
  1.79      +9 -7      httpd-2.0/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- http_config.h	2001/05/11 04:35:31	1.78
  +++ http_config.h	2001/05/11 18:21:27	1.79
  @@ -677,7 +677,8 @@
    * @return Error string on failure, NULL on success
    * @deffunc char *ap_build_cont_config(apr_pool_t *p, apr_pool_t *temp_pool, cmd_parms
*parms, ap_directive_t **current, ap_directive_t **curr_parent, char *orig_directive)
   */
  -const char * ap_build_cont_config(apr_pool_t *p, apr_pool_t *temp_pool,
  +AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p, 
  +                                  apr_pool_t *temp_pool,
                                     cmd_parms *parms,
                                     ap_directive_t **current,
                                     ap_directive_t **curr_parent,
  @@ -840,7 +841,7 @@
    * @param p The pool to allocate the config vector out of
    * @return The config vector
    */
  -AP_DECLARE(ap_conf_vector_t*) ap_create_request_config(apr_pool_t *p);
  +AP_CORE_DECLARE(ap_conf_vector_t*) ap_create_request_config(apr_pool_t *p);
   
   /**
    * Setup the config vector for per dir module configs
  @@ -856,7 +857,7 @@
    * @param base The base directory config structure
    * @param new_conf The new directory config structure
    */
  -ap_conf_vector_t *ap_merge_per_dir_configs(apr_pool_t *p,
  +AP_CORE_DECLARE(ap_conf_vector_t*) ap_merge_per_dir_configs(apr_pool_t *p,
                                              ap_conf_vector_t *base,
                                              ap_conf_vector_t *new_conf);
   
  @@ -866,7 +867,7 @@
    * @param p The pool to allocate the config vector out of
    * @return The config vector
    */
  -ap_conf_vector_t *ap_create_conn_config(apr_pool_t *p);
  +AP_CORE_DECLARE(ap_conf_vector_t*) ap_create_conn_config(apr_pool_t *p);
   
   /* For http_core.c... (<Directory> command and virtual hosts) */
   
  @@ -879,7 +880,8 @@
    * @param access_name The list of possible names for .htaccess files
    * int The status of the current request
    */
  -int ap_parse_htaccess(ap_conf_vector_t **result, request_rec *r, int override,
  +AP_CORE_DECLARE(int) ap_parse_htaccess(ap_conf_vector_t **result, 
  +                      request_rec *r, int override,
                         const char *path, const char *access_name);
   
   /**
  @@ -902,7 +904,7 @@
    * @param p Pool for general allocation
    * @param ptem Pool for temporary allocation
    */
  -void ap_process_resource_config(server_rec *s, const char *fname, 
  +AP_DECLARE(void) ap_process_resource_config(server_rec *s, const char *fname, 
                    ap_directive_t **conftree, apr_pool_t *p, apr_pool_t *ptemp);
   
   /**
  @@ -922,7 +924,7 @@
    * @param r The current request
    * @return The status of the current request
    */
  -int ap_invoke_handler(request_rec *r);
  +AP_CORE_DECLARE(int) ap_invoke_handler(request_rec *r);
   
   /* for mod_perl */
   
  
  
  

Mime
View raw message