Build fix for mingw64 7.3 (Qt 5.12.0)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f035a66be6828f04bfcf4a8bca9a2777750bed0d..98e63194c763136f065cdedee1b947666be285f4 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,7 @@ if(NOT TOKEN_AUTH_ONLY)
     find_package(Qt5Keychain REQUIRED)
 endif()
 
+# TODO: Mingw64 7.3 might also need to be excluded here as it seems to not automatically link libssp
 if(NOT MSVC)
   if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "^(alpha|parisc|hppa)") AND NOT CMAKE_CROSSCOMPILING)
     if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))

diff --git a/src/csync/std/c_private.h b/src/csync/std/c_private.h
index 1802c2f38d83e3e11476f2ff7f801e01e5ccec23..9b1ee25026a0834f00e3d888485f17f23d65104b 100644 (file)
--- a/src/csync/std/c_private.h
+++ b/src/csync/std/c_private.h
@@ -42,8 +42,6 @@
 #include <errno.h>  // NOLINT this is sometimes compiled in C mode
 
 #ifdef __MINGW32__
-#define EDQUOT 0
-#define ENODATA 0
 #ifndef S_IRGRP
 #define S_IRGRP 0
 #endif
@@ -74,10 +72,6 @@
 #include <fcntl.h>
 #endif
 
-#ifndef ENODATA
-#define ENODATA EPIPE
-#endif
-
 
 #ifdef _WIN32
 typedef struct stat64 csync_stat_t; // NOLINT this is sometimes compiled in C mode
@@ -90,10 +84,6 @@ typedef struct stat csync_stat_t; // NOLINT this is sometimes compiled in C mode
 #define O_NOATIME 0
 #endif
 
-#ifndef ENODATA
-#define ENODATA EBADF
-#endif
-
 #if !defined(HAVE_ASPRINTF)
 #if defined(HAVE___MINGW_ASPRINTF)
 #define asprintf __mingw_asprintf