diff options
Diffstat (limited to 'misc')
-rw-r--r-- | misc/netware/libprews.c | 10 | ||||
-rw-r--r-- | misc/netware/start.c | 6 | ||||
-rw-r--r-- | misc/unix/errorcodes.c | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/misc/netware/libprews.c b/misc/netware/libprews.c index 6395adee4..a1dda594c 100644 --- a/misc/netware/libprews.c +++ b/misc/netware/libprews.c @@ -16,7 +16,9 @@ #include <netware.h> #include <library.h> #include <nks/synch.h> +#ifdef USE_WINSOCK #include "novsock2.h" +#endif #include "apr_pools.h" #include "apr_private.h" @@ -58,7 +60,9 @@ int _NonAppStart #pragma unused(messageCount) #pragma unused(messages) +#ifdef USE_WINSOCK WSADATA wsaData; +#endif apr_status_t status; gLibId = register_library(DisposeLibraryData); @@ -84,14 +88,20 @@ int _NonAppStart if ((status = apr_pool_initialize()) != APR_SUCCESS) return status; +#ifdef USE_WINSOCK return WSAStartup((WORD) MAKEWORD(2, 0), &wsaData); +#else + return 0; +#endif } void _NonAppStop( void ) { apr_pool_terminate(); +#ifdef USE_WINSOCK WSACleanup(); +#endif unregister_library(gLibId); NXMutexFree(gLibLock); diff --git a/misc/netware/start.c b/misc/netware/start.c index d359c3de4..2cbfe9bfc 100644 --- a/misc/netware/start.c +++ b/misc/netware/start.c @@ -23,6 +23,7 @@ #include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */ #include "apr_arch_internal_time.h" +#ifdef USE_WINSOCK /* ** Resource tag signatures for using NetWare WinSock 2. These will no longer ** be needed by anyone once the new WSAStartupWithNlmHandle() is available @@ -103,6 +104,7 @@ static int RegisterAppWithWinSock (void *nlm_handle) return err; } +#endif @@ -140,11 +142,13 @@ APR_DECLARE(apr_status_t) apr_initialize(void) apr_pool_tag(pool, "apr_initilialize"); +#ifdef USE_WINSOCK err = RegisterAppWithWinSock (nlmhandle); if (err) { return err; } +#endif apr_signal_init(pool); @@ -173,7 +177,9 @@ APR_DECLARE_NONSTD(void) apr_terminate(void) away. */ netware_pool_proc_cleanup (); +#ifdef USE_WINSOCK UnregisterAppWithWinSock (app_data->gs_nlmhandle); +#endif } APR_DECLARE(void) apr_terminate2(void) diff --git a/misc/unix/errorcodes.c b/misc/unix/errorcodes.c index d814763b5..45b8e21ec 100644 --- a/misc/unix/errorcodes.c +++ b/misc/unix/errorcodes.c @@ -183,7 +183,7 @@ static char *apr_os_strerror(char* buf, apr_size_t bufsize, int err) return stuffbuffer(buf, bufsize, result); } -#elif defined(WIN32) || defined(NETWARE) +#elif defined(WIN32) || (defined(NETWARE) && defined(USE_WINSOCK)) static const struct { apr_status_t code; |