You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@hyperreal.org on 1999/10/21 03:29:56 UTC

cvs commit: apache-2.0/src/os/win32 mod_dll.c

stoddard    99/10/20 18:29:56

  Modified:    src/os/win32 mod_dll.c
  Log:
  Port mod_dll to the new module structure
  
  Revision  Changes    Path
  1.4       +10 -14    apache-2.0/src/os/win32/mod_dll.c
  
  Index: mod_dll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/mod_dll.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_dll.c	1999/10/11 22:40:05	1.3
  +++ mod_dll.c	1999/10/21 01:29:54	1.4
  @@ -108,7 +108,7 @@
   static int been_there_done_that = 0; /* Loaded the modules yet? */
   static int have_symbol_table = 0;
   
  -char *load_module (cmd_parms *cmd, void *dummy, char *modname, char *filename)
  +static char *load_module (cmd_parms *cmd, void *dummy, char *modname, char *filename)
   {
       HINSTANCE modhandle;
       module *modp;
  @@ -146,7 +146,7 @@
       return NULL;
   }
   
  -char *load_file (cmd_parms *cmd, void *dummy, char *filename)
  +static char *load_file (cmd_parms *cmd, void *dummy, char *filename)
   {
      if (been_there_done_that) return NULL;
       
  @@ -156,7 +156,7 @@
   	return NULL;
   }
   
  -void check_loaded_modules (server_rec *dummy, ap_context_t *p)
  +static void check_loaded_modules (ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp, server_rec *dummy)
   {
       if (been_there_done_that) return;
   
  @@ -170,21 +170,17 @@
     "files or libraries to link into the server at runtime"},
   { NULL }
   };
  -
  +static void register_hooks(void)
  +{
  +    ap_hook_post_config(check_loaded_modules, NULL, NULL, HOOK_MIDDLE);
  +}
   module dll_module = {
  -   STANDARD_MODULE_STUFF,
  -   check_loaded_modules,	/* initializer */
  -   NULL,			/* create per-dir config */
  +   STANDARD20_MODULE_STUFF,
  +   NULL,		        /* create per-dir config */
      NULL,			/* merge per-dir config */
      NULL,			/* server config */
      NULL,			/* merge server config */
      dll_cmds,			/* command ap_table_t */
      NULL,			/* handlers */
  -   NULL,			/* filename translation */
  -   NULL,			/* check_user_id */
  -   NULL,			/* check auth */
  -   NULL,			/* check access */
  -   NULL,			/* type_checker */
  -   NULL,			/* logger */
  -   NULL				/* header parser */
  +   register_hooks               /* register hooks */
   };