Changeset 212 in Main for trunk/Server/main.c

Timestamp:

Oct 3, 2024, 2:44:55 AM (6 weeks ago)

Author:

Nishi

Message:

compiles on vc6

File:

• trunk/Server/main.c (modified) (8 diffs)

trunk/Server/main.c

@@ -5 +5 @@
 #include "../config.h"
 
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <stdbool.h>
@@ -23 +25 @@
 #include "tw_version.h"
 
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(_MSC_VER)
 #include <windows.h>
 #endif
@@ -60 +62 @@
 #define printf(...) tt_printf(__VA_ARGS__)
 #define STDERR_LOG(...) tt_printf(__VA_ARGS__)
+#elif defined(_MSC_VER)
+void STDERR_LOG(const char* format, ...){
+        va_list args;
+        va_start(args, format);
+        vfprintf(stderr, format, args);
+        va_end(args);
+}
 #else
 #define STDERR_LOG(...) fprintf(stderr, __VA_ARGS__)
@@ -72 +81 @@
 int startup(int argc, char** argv);
 
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(_MSC_VER)
 char* get_registry(const char* main, const char* sub) {
         DWORD bufsize = 512;
@@ -511 +520 @@
 
 int main(int argc, char** argv) {
+        int st;
         logfile = stderr;
 #ifdef SERVICE
@@ -667 +677 @@
         SleepThread();
 #endif
-        int st = startup(argc, argv);
+        st = startup(argc, argv);
         if(st != -1) {
 #ifdef _PSP
@@ -692 +702 @@
 int startup(int argc, char** argv) {
         int i;
-#ifdef __MINGW32__
+        char* r;
+#if defined(__MINGW32__) || defined(_MSC_VER)
         char* confpath = cm_strdup(PREFIX "/etc/tewi.conf");
         char* regpath = get_registry("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Tewi HTTPd", "InstallDir");
@@ -770 +781 @@
         }
         sprintf(tw_server, "Tewi/%s (%s)%s", tw_get_version(), tw_get_platform(), config.extension == NULL ? "" : config.extension);
-        char* r = cm_strcat(tw_server, " running...");
+        r = cm_strcat(tw_server, " running...");
         cm_force_log(r);
         free(r);
-#ifndef __MINGW32__
+#if !defined(__MINGW32__) && !defined(_MSC_VER)
         signal(SIGCHLD, SIG_IGN);
         signal(SIGPIPE, SIG_IGN);