module works

git-svn-id: file:///raid/svn-personal/tewi/trunk@314 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Module/Makefile b/Module/Makefile
index 88f593346cb0dd606d32db20ef9ebcd04d48c561..2f7070fe181d22583bd66fc2c7c48c2abc9b6113 100644 (file)
--- a/Module/Makefile
+++ b/Module/Makefile
@@ -18,4 +18,4 @@ all: mod_cgi$(LIBSUF) mod_proxy$(LIBSUF)
        $(CC) $(CFLAGS) -I ../Server -c -o $@ $<
 
 clean:
-       rm -f *.o *.so *.a *.dll *.tds
+       rm -f *.o *.so *.a *.dll *.tds *.obj

diff --git a/Module/mod_proxy.c b/Module/mod_proxy.c
index 96076a66292e4fc81ea060a3792bbcf0458d9ead..ab26a42443be01e9412318c8aad0e8ebeb78656c 100644 (file)
--- a/Module/mod_proxy.c
+++ b/Module/mod_proxy.c
@@ -5,7 +5,7 @@
 #include <cm_string.h>
 
 int MODULE_DECL mod_init(struct tw_config* config, struct tw_tool* tools) {
-       tools->log("CGI", "Initializing Proxy module");
+       tools->log("Proxy", "Initializing Proxy module");
        tools->add_version("Proxy/1.0");
        return 0;
 }

diff --git a/README.tmpl b/README.tmpl
index b32db4d4230645acf223abc8dae96234d546cd7c..a91c3ee85727fc2dc7f4a4c06bf1c659b7b4acce 100644 (file)
--- a/README.tmpl
+++ b/README.tmpl
@@ -44,7 +44,8 @@ OpenBSD                  Working
 Haiku                    Working
 Minix                    Working
 UnixWare                 Working on 7.1.1
-OS/2                     Mostly working, module is broken. Help required!
+OS/2                     Working
+NetWare                  WIP
 PlayStation Portable     Working, missing module support
                          TODO: Get multi-threading working (maybe)
 PlayStation 2            Not working

diff --git a/Server/server.c b/Server/server.c
index 2e33661a4bb7f81fc987ebd7cf39ec4766b2f63d..05236d631a23c0316a95bad09b3da4d00befb8da 100644 (file)
--- a/Server/server.c
+++ b/Server/server.c
@@ -628,7 +628,11 @@ int tw_server_pass(void* ptr) {
                }
 #endif
                for(i = 0; i < config.module_count; i++) {
+#ifdef __OS2__
+                       tw_mod_request_t mod_req = (tw_mod_request_t)tw_module_symbol(config.modules[i], "MOD_REQUEST");
+#else
                        tw_mod_request_t mod_req = (tw_mod_request_t)tw_module_symbol(config.modules[i], "mod_request");
+#endif
                        if(mod_req != NULL) {
                                int ret = mod_req(&tools, &req, &res);
                                int co = ret & 0xff;

diff --git a/Server/tw_module.h b/Server/tw_module.h
index e50d6ecfbd8bc39c23200090217bcb53e0ec770b..1c345d6d679379c137e972f2fda8022ce7d2ed55 100644 (file)
--- a/Server/tw_module.h
+++ b/Server/tw_module.h
@@ -14,7 +14,7 @@ extern "C" {
 #define INCL_DOSMODULEMGR
 #define INCL_DOSERRORS
 #include <os2.h>
-#define MODULE_DECL APIENTRY
+#define MODULE_DECL __export APIENTRY
 #else
 #define MODULE_DECL
 #endif