refactoring: consolidate ifdefs

diff --git a/fortune-mod/util/fortune-mod-common.h b/fortune-mod/util/fortune-mod-common.h
index 758af25cfcfe4b2e71d890b97d9fd501ec8e77db..e6d479adeddc2d7df6d01242c126eddc456449d7 100644 (file)
--- a/fortune-mod/util/fortune-mod-common.h
+++ b/fortune-mod/util/fortune-mod-common.h
@@ -38,10 +38,15 @@
 #pragma once
 #include <sys/types.h>
 #include <sys/stat.h>
-/* For ntohl() */
 #ifdef _WIN32
+/* For ntohl() */
 #include <winsock2.h>
 #define getpid() 0
+#include <windows.h>
+#include "getopt.h"
+#define random(x) rand(x)
+#define srandom(x) srand(x)
+#define sleep(n) Sleep((n)*1000)
 #else
 #include <arpa/inet.h>
 #include <unistd.h>
@@ -57,12 +62,5 @@
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
 #endif /* MAXPATHLEN */
-#if defined(_WIN32)
-#include <windows.h>
-#include "getopt.h"
-#define random(x) rand(x)
-#define srandom(x) srand(x)
-#define sleep(n) Sleep((n)*1000)
-#endif
 #include <rinutils/count.h>
 #include <rinutils/unused.h>