From 803cad95f97bccad675db8d32e2a8951f7dae69a Mon Sep 17 00:00:00 2001
From: david miller <dmiller423@gmail.com>
Date: Fri, 12 Apr 2019 18:13:09 -0400
Subject: [PATCH] gcc flags & misc

---
 core/hw/modem/dns.cpp    | 2 +-
 core/stdclass.cpp        | 2 +-
 core/types.h             | 2 +-
 shell/cmake/config.cmake | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/hw/modem/dns.cpp b/core/hw/modem/dns.cpp
index 1f1b3283e..5eaaf9c8e 100644
--- a/core/hw/modem/dns.cpp
+++ b/core/hw/modem/dns.cpp
@@ -20,7 +20,7 @@
  */
 #include "types.h"
 
-#if BUILD_COMPILER!=COMPILER_VC && (BUILD_COMPILER!=COMPILER_CLANG || !WIN32)
+#if BUILD_COMPILER!=COMPILER_VC && (BUILD_COMPILER!=COMPILER_CLANG || !defined(WIN32))
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/core/stdclass.cpp b/core/stdclass.cpp
index f9acec72f..0ac32fb1d 100644
--- a/core/stdclass.cpp
+++ b/core/stdclass.cpp
@@ -6,7 +6,7 @@
 #include "cfg/cfg.h"
 
 
-#if BUILD_COMPILER==COMPILER_VC || (WIN32 && BUILD_COMPILER==COMPILER_CLANG)
+#if BUILD_COMPILER==COMPILER_VC || BUILD_COMPILER==COMPILER_CLANG && defined(WIN32)
 	#include <io.h>
 	#include <direct.h>
 	#define access _access
diff --git a/core/types.h b/core/types.h
index fbcb74c7c..ac087590e 100644
--- a/core/types.h
+++ b/core/types.h
@@ -518,7 +518,7 @@ typedef union
 
 
 
-#if BUILD_COMPILER==COMPILER_VC || BUILD_COMPILER==COMPILER_CLANG && WIN32
+#if BUILD_COMPILER==COMPILER_VC || BUILD_COMPILER==COMPILER_CLANG && defined(WIN32)
 #pragma warning( disable : 4127 4996 /*4244*/)
 #else
 #define stricmp strcasecmp
diff --git a/shell/cmake/config.cmake b/shell/cmake/config.cmake
index ad4b53b9d..ac4eb3238 100644
--- a/shell/cmake/config.cmake
+++ b/shell/cmake/config.cmake
@@ -305,7 +305,7 @@ elseif ((${BUILD_COMPILER} EQUAL ${COMPILER_GCC}) OR
   endif() # X86 family
   
     
-  set(_CXX_FLAGS "${_CXX_FLAGS} -std=c++17 -fcxx-exceptions") ## xbyak needs exceptions
+  set(_CXX_FLAGS "${_CXX_FLAGS} -std=c++17") # -fcxx-exceptions") ## xbyak needs exceptions
 
 
 endif()