WebSVN – Tewi – Diff – /trunk/Server/server.c

-/* $Id: server.c 215 2024-10-02 19:24:43Z nishi $ */
+/* $Id: server.c 216 2024-10-02 19:31:23Z nishi $ */
 #define SOURCE
 #include "../config.h"
 #include <winsock2.h>
 #include <process.h>
 #include <windows.h>
 #include "strptime.h"
+typedef int socklen_t;
 #else
 #ifdef USE_POLL
 #ifdef __PPU__
 #include <net/poll.h>
 #else
 	int port;
 	bool ssl;
 	SOCKADDR addr;
 };
-#if defined(__MINGW32__) || defined(_MSC_VER)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__)
-unsigned int WINAPI tw_server_pass(void* ptr) {
-#elif defined(__BORLANDC__)
+#define NO_RETURN_THREAD
 void tw_server_pass(void* ptr) {
 #elif defined(__HAIKU__)
 int32_t tw_server_pass(void* ptr) {
 #elif defined(_PSP) || defined(__PPU__)
 int tw_server_pass(void* ptr) {
 	int sock = ((struct pass_entry*)ptr)->sock;
 	bool ssl = ((struct pass_entry*)ptr)->ssl;
 	int port = ((struct pass_entry*)ptr)->port;
 	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
 	SSL* s = NULL;
 #ifndef NO_SSL
 	SSL_CTX* ctx = NULL;
 			char* slash;
 			cm_log("Server", "Document root is %s", vhost_entry->root == NULL ? "not set" : vhost_entry->root);
 			path = cm_strcat(vhost_entry->root == NULL ? "" : vhost_entry->root, req.path);
 			cm_log("Server", "Filesystem path is %s", path);
 #if defined(_MSC_VER) || defined(__BORLANDC__)
-			for(i = strlen(path) - 1; i >= 0; i--){
+			for(i = strlen(path) - 1; i >= 0; i--) {
-				if(path[i] == '/'){
+				if(path[i] == '/') {
 					path[i] = 0;
-				}else{
+				} else {
 					break;
+				}
+			}
 #endif
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__)
+	}
 	SSL_free(s);
 #endif
 	close_socket(sock);
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__)
-	_endthread(
+	_endthread();
-#ifndef __BORLANDC__
-#endif
-	);
 #elif defined(__HAIKU__)
 		exit_thread(0);
 #endif
-#ifndef __BORLANDC__
+#ifndef NO_RETURN_THREAD
 	return 0;
 #endif
+}
 #ifdef SERVICE

Subversion Repositories Tewi

(root)/trunk/Server/server.c – Rev 215 → 216