Remove win32 and cygwin support

4 files changed, 1 insertions, 158 deletions

diff --git a/src/include/gauger.h b/src/include/gauger.h
index d23883742..562208e1f 100644
--- a/src/include/gauger.h
+++ b/src/include/gauger.h
@@ -11,8 +11,6 @@
 #ifndef __GAUGER_H__
 #define __GAUGER_H__
 
-#ifndef WINDOWS
-
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/wait.h>
@@ -79,32 +77,4 @@
       } \
   }
 
-#else /* WINDOWS */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <windef.h>
-
-#define GAUGER(category, counter, value, unit) \
-  { \
-    char __gauger_commandline[MAX_PATH]; \
-    \
-    snprintf(__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -c \"%s\"", \
-             (counter), (long double)(value), (unit), (category));    \
-    __gauger_commandline[MAX_PATH - 1] = '\0'; \
-    system(__gauger_commandline); \
-  }
-
-#define GAUGER_ID(category, counter, value, unit, id) \
-  { \
-    char __gauger_commandline[MAX_PATH]; \
-    \
-    snprintf(__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -i \"%s\" -c \"%s\"", \
-             (counter), (long double)(value), (unit), (id), (category)); \
-    __gauger_commandline[MAX_PATH - 1] = '\0'; \
-    system(__gauger_commandline); \
-  }
-
-#endif // WINDOWS
-
 #endif
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index f693615f1..d1e1e0333 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -59,32 +59,10 @@ enum GNUNET_FILE_Type {
  * Handle used to access files (and pipes).
  */
 struct GNUNET_DISK_FileHandle {
-#if WINDOWS
   /**
-   * File handle under W32.
-   */
-  HANDLE h;
-
-  /**
-   * Type
-   */
-  enum GNUNET_FILE_Type type;
-
-  /**
-   * Structure for overlapped reading (for pipes)
-   */
-  OVERLAPPED *oOverlapRead;
-
-  /**
-   * Structure for overlapped writing (for pipes)
-   */
-  OVERLAPPED *oOverlapWrite;
-#else
-  /**
-   * File handle on other OSes.
+   * File handle on Unix-like systems.
    */
   int fd;
-#endif
 };
 
 
@@ -495,19 +473,6 @@ const struct GNUNET_DISK_FileHandle *
 GNUNET_DISK_pipe_handle(const struct GNUNET_DISK_PipeHandle *p,
                         enum GNUNET_DISK_PipeEnd n);
 
-
-#if WINDOWS
-/**
- * Get a GNUnet file handle from a W32 handle (W32-only).
- * Do not call on non-W32 platforms (returns NULL).
- *
- * @param handle native handle
- * @return GNUnet file handle corresponding to the W32 handle
- */
-struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_get_handle_from_w32_handle(HANDLE osfh);
-#endif
-
 /**
  * Update POSIX permissions mask of a file on disk.  If both argumets
  * are #GNUNET_NO, the file is made world-read-write-executable (777).
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 2a91621a3..bdf568385 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -60,25 +60,6 @@ struct GNUNET_NETWORK_FDSet {
    */
   fd_set sds;
 
-#ifdef WINDOWS
-  /**
-   * Array of file handles (from pipes) that are also in
-   * the FDSet.  Needed as those cannot go into @e sds
-   * on W32.
-   */
-  const struct GNUNET_DISK_FileHandle **handles;
-
-  /**
-   * Size of the @e handles array
-   */
-  unsigned int handles_size;
-
-  /**
-   * Number of @e handles slots in use. Always
-   * smaller than @e handles_size.
-   */
-  unsigned int handles_pos;
-#endif
 };
 
 #include "gnunet_disk_lib.h"
@@ -107,7 +88,6 @@ char *
 GNUNET_NETWORK_shorten_unixpath(char *unixpath);
 
 
-#ifndef WINDOWS
 /**
  * If services crash, they can leave a unix domain socket file on the
  * disk. This needs to be manually removed, because otherwise both
@@ -119,7 +99,6 @@ GNUNET_NETWORK_shorten_unixpath(char *unixpath);
  */
 void
 GNUNET_NETWORK_unix_precheck(const struct sockaddr_un *un);
-#endif
 
 
 /**
@@ -406,19 +385,6 @@ GNUNET_NETWORK_fdset_set(struct GNUNET_NETWORK_FDSet *fds,
                          const struct GNUNET_NETWORK_Handle *desc);
 
 
-#if WINDOWS
-/**
- * Add a W32 file handle to the fd set
- *
- * @param fds fd set
- * @param h the file handle to add
- */
-void
-GNUNET_NETWORK_fdset_handle_set_native_w32_handle(struct GNUNET_NETWORK_FDSet *fds,
-                                                  HANDLE h);
-#endif
-
-
 /**
  * Check whether a socket is part of the fd set
  *
diff --git a/src/include/platform.h b/src/include/platform.h
index e12d08e44..bdfbb4a4b 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -38,13 +38,8 @@
 #endif
 #endif
 
-#ifdef WINDOWS
-#define BREAKPOINT asm ("int $3;");
-#define GNUNET_SIGCHLD 17
-#else
 #define BREAKPOINT
 #define GNUNET_SIGCHLD SIGCHLD
-#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -70,18 +65,6 @@
 
 #define VERBOSE_STATS 0
 
-#ifdef CYGWIN
-#include <sys/reent.h>
-#endif
-
-#ifdef _MSC_VER
-#ifndef FD_SETSIZE
-#define FD_SETSIZE 1024
-#endif
-#include <Winsock2.h>
-#include <ws2tcpip.h>
-#else
-#ifndef MINGW
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -100,10 +83,6 @@
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <grp.h>
-#else
-#include "winproc.h"
-#endif
-#endif
 
 #include <string.h>
 #include <stdio.h>
@@ -114,20 +93,13 @@
 #include <errno.h>
 #include <signal.h>
 #include <libgen.h>
-#ifdef WINDOWS
-#include <malloc.h>             /* for alloca(), on other OSes it's in stdlib.h */
-#endif
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>             /* for mallinfo on GNU */
 #endif
-#ifndef _MSC_VER
 #include <unistd.h>             /* KLB_FIX */
-#endif
 #include <sys/stat.h>
 #include <sys/types.h>
-#ifndef _MSC_VER
 #include <dirent.h>             /* KLB_FIX */
-#endif
 #include <fcntl.h>
 #include <math.h>
 #if HAVE_SYS_PARAM_H
@@ -170,10 +142,6 @@
 #if HAVE_SYS_UCRED_H
 #include <sys/ucred.h>
 #endif
-#ifdef CYGWIN
-#include <windows.h>
-#include <cygwin/if.h>
-#endif
 #if HAVE_IFADDRS_H
 #include <ifaddrs.h>
 #endif
@@ -196,24 +164,11 @@
 #include <sys/endian.h>
 #endif
 
-/* From plibc. */
-#ifdef Q_OS_WIN32
-#define WINDOWS 1
-#endif
-
-#ifndef WINDOWS
 #define DIR_SEPARATOR '/'
 #define DIR_SEPARATOR_STR "/"
 #define PATH_SEPARATOR ':'
 #define PATH_SEPARATOR_STR ":"
 #define NEWLINE "\n"
-#else
-#define DIR_SEPARATOR '\\'
-#define DIR_SEPARATOR_STR "\\"
-#define PATH_SEPARATOR ';'
-#define PATH_SEPARATOR_STR ";"
-#define NEWLINE "\r\n"
-#endif
 
 #include "compat.h"
 
@@ -231,15 +186,7 @@
 #define LIBEXTRACTOR_GETTEXT_DOMAIN "org.gnunet.libextractor"
 #endif
 
-#ifdef CYGWIN
-#define SIOCGIFCONF     _IOW('s', 100, struct ifconf)   /* get if list */
-#define SIOCGIFFLAGS    _IOW('s', 101, struct ifreq)    /* Get if flags */
-#define SIOCGIFADDR     _IOW('s', 102, struct ifreq)    /* Get if addr */
-#endif
-
-#ifndef MINGW
 #include <sys/mman.h>
-#endif
 
 #ifdef FREEBSD
 #define __BYTE_ORDER BYTE_ORDER
@@ -286,13 +233,8 @@ atoll(const char *nptr);
 #define MAKE_UNALIGNED(val) val
 #endif
 
-#if WINDOWS
-#define FDTYPE HANDLE
-#define SOCKTYPE SOCKET
-#else
 #define FDTYPE int
 #define SOCKTYPE int
-#endif
 
 /**
  * The termination signal