Changeset 314 in Main

Timestamp:

Oct 14, 2024, 4:37:04 PM (5 weeks ago)

Author:

Nishi

Message:

module works

Location:

trunk

Files:

• Module/Makefile (modified) (1 diff)
• Module/mod_proxy.c (modified) (1 diff)
• README.tmpl (modified) (1 diff)
• Server/server.c (modified) (1 diff)
• Server/tw_module.h (modified) (1 diff)

trunk/Module/Makefile

@@ -19 +19 @@
 
 clean:
-        rm -f *.o *.so *.a *.dll *.tds
+        rm -f *.o *.so *.a *.dll *.tds *.obj

trunk/Module/mod_proxy.c

@@ -6 +6 @@
 
 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;

trunk/README.tmpl

@@ -45 +45 @@
 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)

trunk/Server/server.c

@@ -629 +629 @@
 #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);

trunk/Server/tw_module.h

@@ -15 +15 @@
 #define INCL_DOSERRORS
 #include <os2.h>
-#define MODULE_DECL APIENTRY
+#define MODULE_DECL __export APIENTRY
 #else
 #define MODULE_DECL