Replace MinGW with Windows to avoid ambiguities

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 022fb53..9850eeb 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -29,19 +29,15 @@
 #define _P1003_1B_VISIBLE
 #endif
 
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
 #ifdef HAVE_LZO
 #include LZO1X_H
 #endif
 
-#ifdef LZ4_H
-#include LZ4_H
+#ifdef HAVE_LZ4
+#include <lz4.h>
 #endif
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 #include <pwd.h>
 #include <grp.h>
 #include <time.h>
@@ -65,15 +61,12 @@ static bool show_help = false;
 /* If nonzero, print the version on standard output and exit.  */
 static bool show_version = false;
 
-/* If nonzero, use null ciphers and skip all key exchanges. */
-bool bypass_security = false;
-
 #ifdef HAVE_MLOCKALL
 /* If nonzero, disable swapping for this process. */
 static bool do_mlock = false;
 #endif
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 /* If nonzero, chroot to netdir after startup. */
 static bool do_chroot = false;
 
@@ -81,12 +74,6 @@ static bool do_chroot = false;
 static const char *switchuser = NULL;
 #endif
 
-/* If nonzero, write log entries to a separate file. */
-bool use_logfile = false;
-
-/* If nonzero, use syslog instead of stderr in no-detach mode. */
-bool use_syslog = false;
-
 char **g_argv;                  /* a copy of the cmdline arguments */
 
 static int status = 1;
@@ -109,7 +96,7 @@ static struct option const long_options[] = {
        {NULL, 0, NULL, 0}
 };
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 static struct WSAData wsa_state;
 int main2(int argc, char **argv);
 #endif
@@ -134,7 +121,7 @@ static void usage(bool status) {
                        "      --pidfile=FILENAME        Write PID and control socket cookie to FILENAME.\n"
                        "      --bypass-security         Disables meta protocol security, for debugging.\n"
                        "  -o, --option[HOST.]KEY=VALUE  Set global/host configuration value.\n"
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
                        "  -R, --chroot                  chroot to NET dir at startup.\n"
                        "  -U, --user=USER               setuid to given USER at startup.\n"
 #endif
@@ -143,7 +130,7 @@ static void usage(bool status) {
                        "\n"
                        "Report bugs to tinc@tinc-vpn.org.\n";
 
-               fprintf(stderr, message, program_name);
+               printf(message, program_name);
        }
 }
 
@@ -209,7 +196,7 @@ static bool parse_options(int argc, char **argv) {
                        list_insert_tail(&cmdline_conf, cfg);
                        break;
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 
                case 'R':
                case 'U':
@@ -302,7 +289,7 @@ exit_fail:
 }
 
 static bool drop_privs(void) {
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
        uid_t uid = 0;
 
        if(switchuser) {
@@ -355,7 +342,7 @@ static bool drop_privs(void) {
        return true;
 }
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 # define setpriority(level) !SetPriorityClass(GetCurrentProcess(), (level))
 
 static void stop_handler(void *data, int flags) {
@@ -458,7 +445,7 @@ int main(int argc, char **argv) {
                return 1;
        }
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 
        if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
                logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
@@ -524,7 +511,7 @@ int main(int argc, char **argv) {
 
 #endif
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
        io_add_event(&stop_io, stop_handler, NULL, WSACreateEvent());
 
        if(stop_io.event == FALSE) {