Commit bc92b999 authored by Bill Stoddard's avatar Bill Stoddard
Browse files

Get APR DSO code working under Windows 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84898 13f79535-47bb-0310-9956-ffa450edef68
parent f9154956

modules/mappers/mod_so.c

+1 −1
Changes for modules/mappers/mod_so.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static void *so_sconf_create(ap_context_t *p, server_rec *s) 
    soc->loaded_modules = ap_make_array(p, DYNAMIC_MODULE_LIMIT, 

                                     sizeof(moduleinfo));

#ifndef NO_DLOPEN

    ap_os_dso_init();

    ap_dso_init();

#endif



    return (void *)soc;

os/win32/os.h

+0 −11
Changes for os/win32/os.h: 0 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -166,18 +166,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_context_t *pPool, const char *sz 
int ap_os_is_filename_valid(const char *file);

int os_strftime(char *, size_t , const char *, const struct tm *);



/* Abstractions for dealing with shared object files (DLLs on Win32).

 * These are used by mod_so.c

 * ToDo: This need to be migrated to APR

 */



#define ap_os_dso_handle_t  HINSTANCE

#define ap_os_dso_init()

#define ap_os_dso_load(l)   LoadLibraryEx(l, NULL, LOAD_WITH_ALTERED_SEARCH_PATH)

#define ap_os_dso_unload(l) FreeLibrary(l)

#define ap_os_dso_sym(h,s)  GetProcAddress(h,s)

#define ap_os_dso_error()   ""	/* for now */



/* Other ap_os_ routines not used by this platform */

#define ap_os_kill(pid, sig)                kill(pid, sig)