Fixed|Cygwin: Build errors

UTF-8 source files not supported by GCC 7.
skyjake · Sep 1, 2019 · 9a8d330 · 9a8d330
1 parent 971f328
commit 9a8d330
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/doomsday/libs/core/include/de/data/time.h b/doomsday/libs/core/include/de/data/time.h
@@ -339,11 +339,6 @@ constexpr TimeSpan operator"" _ns(unsigned long long int nanoseconds)
     return TimeSpan(double(nanoseconds) / 1.0e9);
 }
 
-constexpr TimeSpan operator"" _µs(unsigned long long int microseconds)
-{
-    return TimeSpan(double(microseconds) / 1.0e6);
-}
-
 constexpr TimeSpan operator"" _ms(unsigned long long int milliseconds)
 {
     return TimeSpan(double(milliseconds) / 1.0e3);

diff --git a/doomsday/libs/core/include/de/libcore.h b/doomsday/libs/core/include/de/libcore.h
@@ -95,7 +95,7 @@
  * When using the C API, the Qt string functions are not available, so we
  * must use the platform-specific functions.
  */
-#if defined(UNIX) && defined(DE_C_API_ONLY)
+#if defined (UNIX) && defined (DE_C_API_ONLY)
 #  include <strings.h> // strcasecmp etc.
 #endif
 
@@ -106,7 +106,7 @@
  * classes and functions. DEF files are not used for exporting symbols out
  * of libcore.
  */
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined (_WIN32) && defined (_MSC_VER)
 #  ifdef __LIBCORE__
 // This is defined when compiling the library.
 #    define DE_PUBLIC   __declspec(dllexport)
@@ -115,13 +115,17 @@
 #  endif
 #  define DE_HIDDEN
 #  define DE_NORETURN   __declspec(noreturn)
-#elif defined (MACOSX) || defined(__CYGWIN__)
+#elif defined (__CYGWIN__)
+#  define DE_PUBLIC     __attribute__((visibility("default")))
+#  define DE_HIDDEN     
+#  define DE_NORETURN   __attribute__((__noreturn__))
+#elif defined (MACOSX) 
 #  define DE_PUBLIC     __attribute__((visibility("default")))
 #  define DE_HIDDEN     __attribute__((visibility("hidden")))
 #  define DE_NORETURN   __attribute__((__noreturn__))
 #else
 #  define DE_PUBLIC     __attribute__((visibility("default")))
-#  define DE_HIDDEN     __attribute__((visibility("hidden")))
+#  define DE_HIDDEN 
 #  define DE_NORETURN   __attribute__((__noreturn__))
 #endif