remove microsoft c++ crud

🤔🤔🤔🤔

daemon/dns.cpp

@@ -1,7 +1,4 @@
-#ifndef _MSC_VER
 #include <unistd.h>
-#endif
-
 #include <llarp.h>
 #include <llarp/dns_iptracker.hpp>
 #include <llarp/dnsd.hpp>
@@ -10,11 +7,6 @@
 #include <llarp/threading.hpp>  // for multithreaded version (multiplatorm)
 
 #include <signal.h>  // Linux needs this for SIGINT
-// keep this once jeff reenables concurrency
-#ifdef _MSC_VER
-extern "C" void
-SetThreadName(DWORD dwThreadID, LPCSTR szThreadName);
-#endif
 
 #ifdef _WIN32
 #define uint UINT

daemon/main.cpp

@@ -4,9 +4,7 @@
 #include <getopt.h>
 #include <string>
 #include <iostream>
-#ifndef _MSC_VER
 #include <libgen.h>
-#endif
 #include "fs.hpp"
 #include "config.hpp"  // for ensure_config
 

include/llarp/codel.hpp

@@ -1,11 +1,5 @@
 #ifndef LLARP_CODEL_QUEUE_HPP
 #define LLARP_CODEL_QUEUE_HPP
-#ifdef _MSC_VER
-#define NOMINMAX
-#ifdef min
-#undef min
-#endif
-#endif
 #include <llarp/time.h>
 #include <llarp/logger.hpp>
 #include <llarp/mem.hpp>

include/llarp/net.h

@@ -5,7 +5,6 @@
 #include <ws2tcpip.h>
 #include <wspiapi.h>
 // because this shit is not defined for Windows NT reeeee
-#ifndef _MSC_VER
 #ifdef __cplusplus
 extern "C"
 {
@@ -17,7 +16,6 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif
-#endif
 #ifndef ssize_t
 #define ssize_t long
 #endif

include/llarp/net.hpp

@@ -533,11 +533,7 @@ namespace llarp
       {
         ptr = a.addr4();
       }
-#ifndef _MSC_VER
       if(inet_ntop(a.af(), ptr, tmp, sizeof(tmp)))
-#else
-      if(inet_ntop(a.af(), (void*)ptr, tmp, sizeof(tmp)))
-#endif
       {
         out << tmp;
         if(a.af() == AF_INET6)

llarp/buffer.cpp

@@ -3,10 +3,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#ifndef ssize_t
-#define ssize_t long
-#endif
-
 size_t
 llarp_buffer_size_left(llarp_buffer_t buff)
 {

llarp/context.cpp

@@ -2,9 +2,7 @@
 #include <llarp.h>
 #include <llarp/logger.h>
 #include <signal.h>
-#ifndef _MSC_VER
 #include <sys/param.h>  // for MIN
-#endif
 #include <llarp.hpp>
 #include "router.hpp"
 
@@ -15,16 +13,10 @@
 #include <pthread_np.h>
 #endif
 
-// keep this once jeff reenables concurrency
-#ifdef _MSC_VER
-extern "C" void
-SetThreadName(DWORD dwThreadID, LPCSTR szThreadName);
-#endif
-
-#if _WIN32 || __sun
+/*#if _WIN32 || __sun
 #define wmin(x, y) (((x) < (y)) ? (x) : (y))
 #define MIN wmin
-#endif
+#endif*/
 
 namespace llarp
 {

llarp/ev_win32.hpp

@@ -392,13 +392,13 @@ struct llarp_win32_loop : public llarp_ev_loop
         close_fd = closesocket(std::get< SOCKET >(ev->fd));
         break;
       case 1:
-              stopped = ::CancelIo(std::get< HANDLE >(ev->fd));
-              close_fd = CloseHandle(std::get< HANDLE >(ev->fd));
-              if(close_fd)
-                close_fd = 0;  // must be zero
-              else
-                close_fd = 1;
-              break;
+        stopped  = ::CancelIo(std::get< HANDLE >(ev->fd));
+        close_fd = CloseHandle(std::get< HANDLE >(ev->fd));
+        if(close_fd)
+          close_fd = 0;  // must be zero
+        else
+          close_fd = 1;
+        break;
       default:
         return false;
     }

llarp/net.cpp

@@ -276,6 +276,7 @@ _llarp_nt_getadaptersinfo(struct llarp_nt_ifaddrs_t** ifap)
   return true;
 }
 
+#if 0
 /* Supports both IPv4 and IPv6 addressing.  The size of IP_ADAPTER_ADDRESSES
  * changes between Windows XP, XP SP1, and Vista with additional members.
  *
@@ -293,7 +294,6 @@ _llarp_nt_getadaptersinfo(struct llarp_nt_ifaddrs_t** ifap)
  * NOTE(despair): an inline implementation is provided, much like
  * getaddrinfo(3) for old hosts. See "win32_intrnl.*"
  */
-#ifdef _MSC_VER
 static bool
 _llarp_nt_getadaptersaddresses(struct llarp_nt_ifaddrs_t** ifap)
 {
@@ -309,22 +309,12 @@ _llarp_nt_getadaptersaddresses(struct llarp_nt_ifaddrs_t** ifap)
     fprintf(stderr, "IP_ADAPTER_ADDRESSES buffer length %lu bytes.\n", dwSize);
 #endif
     pAdapterAddresses = (IP_ADAPTER_ADDRESSES*)_llarp_nt_heap_alloc(dwSize);
-#if defined(_MSC_VER) || defined(_WIN64)
-    dwRet = GetAdaptersAddresses(AF_UNSPEC,
-                                 /* requires Windows XP SP1 */
-                                 GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_ANYCAST
-                                     | GAA_FLAG_SKIP_DNS_SERVER
-                                     | GAA_FLAG_SKIP_FRIENDLY_NAME
-                                     | GAA_FLAG_SKIP_MULTICAST,
-                                 nullptr, pAdapterAddresses, &dwSize);
-#else
     dwRet = _GetAdaptersAddresses(
         AF_UNSPEC,
         GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_ANYCAST
             | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME
             | GAA_FLAG_SKIP_MULTICAST,
         nullptr, pAdapterAddresses, &dwSize);
-#endif
     if(ERROR_BUFFER_OVERFLOW == dwRet)
     {
       _llarp_nt_heap_free(pAdapterAddresses);
@@ -656,19 +646,11 @@ _llarp_nt_getadaptersaddresses_nametoindex(const char* ifname)
   for(unsigned i = 3; i; i--)
   {
     pAdapterAddresses = (IP_ADAPTER_ADDRESSES*)_llarp_nt_heap_alloc(dwSize);
-#ifdef _MSC_VER
-    dwRet = GetAdaptersAddresses(
-        AF_UNSPEC,
-        GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_DNS_SERVER
-            | GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_SKIP_MULTICAST,
-        nullptr, pAdapterAddresses, &dwSize);
-#else
     dwRet = _GetAdaptersAddresses(
         AF_UNSPEC,
         GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_DNS_SERVER
             | GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_SKIP_MULTICAST,
         nullptr, pAdapterAddresses, &dwSize);
-#endif
 
     if(ERROR_BUFFER_OVERFLOW == dwRet)
     {
@@ -722,11 +704,7 @@ llarp_nt_getifaddrs(struct llarp_nt_ifaddrs_t** ifap)
   fprintf(stderr, "llarp_nt_getifaddrs (ifap:%p error:%p)\n", (void*)ifap,
           (void*)errno);
 #endif
-#ifdef _MSC_VER
-  return _llarp_nt_getadaptersaddresses(ifap);
-#else
   return _llarp_nt_getadaptersinfo(ifap);
-#endif
 }
 
 static void

llarp/service.cpp

@@ -1,7 +1,3 @@
-#ifdef _MSC_VER
-#define NOMINMAX
-#endif
-
 #include <llarp/service.hpp>
 #include "buffer.hpp"
 #include "fs.hpp"

llarp/threadpool.cpp

@@ -1,7 +1,5 @@
 #include "threadpool.hpp"
-#ifndef _MSC_VER
 #include <pthread.h>
-#endif
 #include <cstring>
 
 #include <llarp/time.h>

llarp/win32_inet.c

@@ -311,7 +311,4 @@ _GetAdaptersAddresses(ULONG Family, ULONG Flags, PVOID Reserved,
 
   return NO_ERROR;
 }
-#elif _MSC_VER
-/* just a comment */
-static void* unused;
 #endif

llarp/win32_intrnl.c

@@ -494,14 +494,10 @@ getInterfaceIndexTable(void)
 
 #endif
 
-/*
- * We need this in the Microsoft C/C++ port, as we're not using Pthreads, and
- * jeff insists on naming the threads at runtime. Apparently throwing exception
- * 1080890248 is only visible when running under a machine code monitor.
- *
- * -despair86 30/07/18
- */
-#ifdef _MSC_VER
+// there's probably an use case for a _newer_ implementation
+// of pthread_setname_np(3), in fact, I may just merge _this_
+// upstream...
+#if 0
 #include <windows.h>
 
 typedef HRESULT(FAR PASCAL *p_SetThreadDescription)(void *, const wchar_t *);

vendor/cppbackport-master/lib/filesystem.h

@@ -30,12 +30,6 @@
 #ifndef PBL_CPP_FILESYSTEM_H
 #define PBL_CPP_FILESYSTEM_H
 
-#if _MSC_VER >= 1900
-#define CPP17
-#define CPP11
-#define CPP14
-#endif
-
 #include "version.h"
 
 #if defined(CPP17) && defined(USE_CXX17_FILESYSTEM)

vendor/cppbackport-master/lib/fs/current_path.cpp

@@ -31,11 +31,7 @@
 
 #include <cerrno>
 
-#ifndef _MSC_VER
 #include <unistd.h>
-#else
-#include <direct.h>
-#endif
 
 namespace cpp17
 {

vendor/cppbackport-master/lib/fs/equivalent.cpp

@@ -30,9 +30,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifndef _MSC_VER
 #include <unistd.h>
-#endif
 
 namespace cpp17
 {

vendor/cppbackport-master/lib/fs/filestatus.cpp

@@ -31,113 +31,12 @@
 
 #include <iostream>
 
-#ifndef _MSC_VER
 #include <unistd.h>
-#endif
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include "path.h"
 
-#ifdef _MSC_VER
-#include <Windows.h>
-#include <stdint.h>
-#include <io.h>
-
-typedef unsigned short mode_t;
-typedef uint32_t id_t; /* Internal uids/gids are 32-bits */
-
-typedef SSIZE_T ssize_t;
-#ifndef _OFF_T_DEFINED
-typedef DWORD64 off_t;
-#endif
-typedef uint32_t uid_t; /* [???] user IDs */
-
-#ifndef S_IFIFO
-#define S_IFIFO 0010000 /* [XSI] named pipe (fifo) */
-#endif
-
-#ifndef S_IFBLK
-#define S_IFBLK 0060000 /* [XSI] block special */
-#endif
-
-#ifndef S_IFLNK
-#define S_IFLNK 0120000 /* [XSI] symbolic link */
-#endif
-
-#ifndef S_IFSOCK
-#define S_IFSOCK 0140000 /* [XSI] socket */
-#endif
-
-#ifndef S_ISBLK
-#define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block special */
-#endif
-
-#ifndef S_ISCHR
-#define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* char special */
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */
-#endif
-
-#ifndef S_ISFIFO
-#define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo or socket */
-#endif
-
-#ifndef S_ISREG
-#define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* regular file */
-#endif
-
-#ifndef S_ISLNK
-#define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */
-#endif
-
-#ifndef S_ISSOCK
-#define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */
-#endif
-
-#ifndef makedev
-#define makedev(x, y) ((dev_t)(((x) << 24) | (y)))
-#endif
-
-#ifndef DT_UNKNOWN
-#define DT_UNKNOWN 0
-#endif
-
-#ifndef DT_FIFO
-#define DT_FIFO 1
-#endif
-
-#ifndef DT_CHR
-#define DT_CHR 2
-#endif
-
-#ifndef DT_DIR
-#define DT_DIR 4
-#endif
-
-#ifndef DT_BLK
-#define DT_BLK 6
-#endif
-
-#ifndef DT_REG
-#define DT_REG 8
-#endif
-
-#ifndef DT_LNK
-#define DT_LNK 10
-#endif
-
-#ifndef DT_SOCK
-#define DT_SOCK 12
-#endif
-
-#ifndef DT_WHT
-#define DT_WHT 14
-#endif
-#endif
-
 namespace
 {
   ::cpp17::filesystem::file_status

vendor/libtuntap-master/tuntap.cpp

@@ -31,12 +31,10 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <wspiapi.h>
-#ifndef _MSC_VER
 extern "C" int
 inet_pton(int af, const char *src, void *dst);
 extern "C" const char *
 inet_ntop(int af, const void *src, char *dst, size_t size);
-#endif
 #else
 #include <arpa/inet.h>
 #include <netinet/in.h>