diff --git a/src/os/netware/Makefile b/src/os/netware/Makefile index 0609b30b..43775c67 100644 --- a/src/os/netware/Makefile +++ b/src/os/netware/Makefile @@ -4,6 +4,7 @@ NDRIVE = g: NDK_ROOT = $(NDKBASE)/ndk SDK_LIBC = $(NDK_ROOT)/libc +SDK_CLIB = $(NDK_ROOT)/clib JBINDINGS = ../../../bindings/java JBUILD = $(JBINDINGS)/build @@ -35,7 +36,9 @@ LDFLAGS = -nostdlib $(PRELUDE) $(DEF_FILE) $(NW_OBJ) $(SIGAR_OBJ) $(JNI_OBJ) -o INCLUDES += \ -I$(SDK_LIBC)/include \ -I$(SDK_LIBC)/include/nks \ --I$(SDK_LIBC)/include/winsock +-I$(SDK_LIBC)/include/winsock \ +-I$(SDK_CLIB)/include \ +-I$(SDK_CLIB)/include/nlm CFLAGS += $(INCLUDES) diff --git a/src/os/netware/netware_sigar.c b/src/os/netware/netware_sigar.c index c4937747..8d357459 100644 --- a/src/os/netware/netware_sigar.c +++ b/src/os/netware/netware_sigar.c @@ -47,11 +47,14 @@ int _NonAppStart(void *NLMHandle, WSADATA wsaData; + NWCallsInit(NULL, NULL); + return WSAStartup((WORD)MAKEWORD(2, 0), &wsaData); } void _NonAppStop(void) { + NWCallsTerm(NULL); WSACleanup(); } diff --git a/src/os/netware/sigar.def.in b/src/os/netware/sigar.def.in index 0a7c4570..53bd17fa 100644 --- a/src/os/netware/sigar.def.in +++ b/src/os/netware/sigar.def.in @@ -12,6 +12,8 @@ check _LibCCheckUnload import @c:/novell/ndk/libc/imports/libc.imp import @c:/novell/ndk/libc/imports/netware.imp import @c:/novell/ndk/libc/imports/ws2nlm.imp +import @c:/novell/ndk/clib/imports/clib.imp +import @c:/novell/ndk/clib/imports/calnlm32.imp module libc export @../../../bindings/java/build/src/javasigar_generated.def