Changeset 105 in Main for trunk/Server/server.c

Timestamp:

Sep 20, 2024, 10:08:44 PM (8 weeks ago)

Author:

Nishi

Message:

fix

File:

• trunk/Server/server.c (modified) (7 diffs)

trunk/Server/server.c

@@ -407 +407 @@
 #elif defined(__HAIKU__)
 int32_t tw_server_pass(void* ptr) {
+#endif
+#if defined(__HAIKU__) || defined(__MINGW32__)
         int sock = ((struct pass_entry*)ptr)->sock;
         bool ssl = ((struct pass_entry*)ptr)->ssl;
@@ -413 +415 @@
         free(ptr);
 #else
-void tw_server_pass(int sock, bool ssl, int port, SOCKADDR addr) {
+        void tw_server_pass(int sock, bool ssl, int port, SOCKADDR addr) {
 #endif
         char* name = config.hostname;
@@ -429 +431 @@
         }
 #else
-        void* s = NULL;
+                void* s = NULL;
 #endif
         struct tw_http_request req;
@@ -455 +457 @@
                                         cmtime -= (btm->tm_hour * 60 + btm->tm_min) * 60;
 #else
-                                        cmtime = timegm(&tm);
+                                                cmtime = timegm(&tm);
 #endif
                                 }
@@ -740 +742 @@
         _endthreadex(0);
 #elif defined(__HAIKU__)
-        exit_thread(0);
+                exit_thread(0);
 #endif
         ;
@@ -780 +782 @@
                 int ret = select(32, &fdset, NULL, NULL, &tv);
 #else
-                int ret = select(FD_SETSIZE, &fdset, NULL, NULL, &tv);
+                        int ret = select(FD_SETSIZE, &fdset, NULL, NULL, &tv);
 #endif
                 if(ret == -1) {
@@ -829 +831 @@
                                         }
 #elif defined(__HAIKU__)
-                                        int j;
-                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
-                                                if(threads[j].used) {
-                                                        thread_info info;
-                                                        bool kill = false;
-                                                        if(get_thread_info(threads[j].thread, &info) == B_OK) {
-                                                        } else {
-                                                                kill = true;
-                                                        }
-                                                        if(kill) {
-                                                                threads[j].used = false;
+                                                int j;
+                                                for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
+                                                        if(threads[j].used) {
+                                                                thread_info info;
+                                                                bool kill = false;
+                                                                if(get_thread_info(threads[j].thread, &info) == B_OK) {
+                                                                } else {
+                                                                        kill = true;
+                                                                }
+                                                                if(kill) {
+                                                                        threads[j].used = false;
+                                                                }
                                                         }
                                                 }
-                                        }
-                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
-                                                if(!threads[j].used) {
-                                                        threads[j].thread = spawn_thread(tw_server_pass, "Tewi HTTPd", 60, e);
-                                                        threads[j].used = true;
-                                                        resume_thread(threads[j].thread);
-                                                        break;
+                                                for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
+                                                        if(!threads[j].used) {
+                                                                threads[j].thread = spawn_thread(tw_server_pass, "Tewi HTTPd", 60, e);
+                                                                threads[j].used = true;
+                                                                resume_thread(threads[j].thread);
+                                                                break;
+                                                        }
                                                 }
-                                        }
 #else
                                         pid_t pid = fork();