Changeset 216 in Main

Timestamp:

Oct 3, 2024, 4:31:23 AM (6 weeks ago)

Author:

Nishi

Message:

fix windows

Location:

trunk

Files:

• Platform/win32-service.mk (modified) (1 diff)
• Platform/win32.mk (modified) (1 diff)
• Platform/win64-service.mk (modified) (1 diff)
• Platform/win64.mk (modified) (1 diff)
• Server/server.c (modified) (5 diffs)
• VC6Compat/stdint.h (modified) (1 diff)

trunk/Platform/win32-service.mk

@@ -10 +10 @@
 LIBS = -lws2_32
 EXEC = .exe
-LIB = .dll
+LIBSUF = .dll
 PREOBJS = tewi.res

trunk/Platform/win32.mk

@@ -10 +10 @@
 LIBS = -lws2_32
 EXEC = .exe
-LIB = .dll
+LIBSUF = .dll
 PREOBJS = tewi.res

trunk/Platform/win64-service.mk

@@ -10 +10 @@
 LIBS = -lws2_32
 EXEC = .exe
-LIB = .dll
+LIBSUF = .dll
 PREOBJS = tewi.res

trunk/Platform/win64.mk

@@ -10 +10 @@
 LIBS = -lws2_32
 EXEC = .exe
-LIB = .dll
+LIBSUF = .dll
 PREOBJS = tewi.res

trunk/Server/server.c

@@ -43 +43 @@
 
 #include "strptime.h"
+typedef int socklen_t;
 #else
 #ifdef USE_POLL
@@ -449 +450 @@
 };
 
-#if defined(__MINGW32__) || defined(_MSC_VER)
-unsigned int WINAPI tw_server_pass(void* ptr) {
-#elif defined(__BORLANDC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__)
+#define NO_RETURN_THREAD
 void tw_server_pass(void* ptr) {
 #elif defined(__HAIKU__)
@@ -465 +465 @@
         SOCKADDR addr = ((struct pass_entry*)ptr)->addr;
 #else
+#define NO_RETURN_THREAD
         void tw_server_pass(int sock, bool ssl, int port, SOCKADDR addr) {
 #endif
@@ -619 +620 @@
                         cm_log("Server", "Filesystem path is %s", path);
 #if defined(_MSC_VER) || defined(__BORLANDC__)
-                        for(i = strlen(path) - 1; i >= 0; i--){
-                                if(path[i] == '/'){
+                        for(i = strlen(path) - 1; i >= 0; i--) {
+                                if(path[i] == '/') {
                                         path[i] = 0;
-                                }else{
+                                } else {
                                         break;
                                 }
@@ -899 +900 @@
         close_socket(sock);
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__)
-        _endthread(
-#ifndef __BORLANDC__
-                0
-#endif
-        );
+        _endthread();
 #elif defined(__HAIKU__)
                 exit_thread(0);
 #endif
-#ifndef __BORLANDC__
+#ifndef NO_RETURN_THREAD
         return 0;
 #endif

trunk/VC6Compat/stdint.h

@@ -10 +10 @@
 typedef signed short int16_t;
 typedef signed int int32_t;
-typedef int socklen_t;
 
 #define INT32_MAX 0x7fffffff