dgaudet 98/03/17 11:47:56
Modified: src/include hide.h
src/modules/standard mod_so.c
Log:
more statics
the mod_so_null_cleanup thing shouldn't be required any longer now that
null_cleanup is API_EXPORT_NONSTD.
Revision Changes Path
1.15 +0 -2 apache-1.3/src/include/hide.h
Index: hide.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- hide.h 1998/03/17 13:08:55 1.14
+++ hide.h 1998/03/17 19:47:45 1.15
@@ -470,8 +470,6 @@
#define uname2id AP_uname2id
#define unblock_alarms AP_unblock_alarms
#define unescape_url AP_unescape_url
-#define unload_file AP_unload_file
-#define unload_module AP_unload_module
#define unparse_uri_components AP_unparse_uri_components
#define unregister_other_child AP_unregister_other_child
#define update_child_status AP_update_child_status
1.13 +4 -18 apache-1.3/src/modules/standard/mod_so.c
Index: mod_so.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_so.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_so.c 1998/03/16 12:04:39 1.12
+++ mod_so.c 1998/03/17 19:47:54 1.13
@@ -177,7 +177,7 @@
* This is called as a cleanup function from the core.
*/
-void unload_module(moduleinfo *modi)
+static void unload_module(moduleinfo *modi)
{
/* only unload if module information is still existing */
if (modi->modp == NULL)
@@ -201,27 +201,13 @@
* or include the filename in error message.
*/
-void unload_file(void *handle)
+static void unload_file(void *handle)
{
/* The Linux manpage doesn't give any way to check the success of
* dlclose() */
os_dl_unload((os_dl_module_handle_type)handle);
}
-#ifdef WIN32
-/*
- * This is a cleanup which does nothing. On Win32 using the API-provided
- * null_cleanup() function gives a "pointers to functions
- * with different attributes" error during compilation.
- */
-void mod_so_null_cleanup(module *modp)
-{
- /* This function left intentionally blank */
-}
-#else
-# define mod_so_null_cleanup null_cleanup
-#endif
-
/*
* This is called for the directive LoadModule and actually loads
* a shared object file into the address space of the server process.
@@ -292,7 +278,7 @@
* shared object to be unloaded.
*/
register_cleanup(cmd->pool, modi,
- (void (*)(void*))unload_module, mod_so_null_cleanup);
+ (void (*)(void*))unload_module, null_cleanup);
/*
* Finally we need to run the configuration functions
@@ -331,7 +317,7 @@
aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL,
"loaded file %s", filename);
- register_cleanup(cmd->pool, handle, unload_file, mod_so_null_cleanup);
+ register_cleanup(cmd->pool, handle, unload_file, null_cleanup);
return NULL;
}
