diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/cpu/m6809/konami.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/m6809/m6809.cpp | 3 | ||||
-rw-r--r-- | src/emu/inpttype.h | 4 | ||||
-rw-r--r-- | src/lib/util/delegate.h | 5 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/devices/cpu/m6809/konami.cpp b/src/devices/cpu/m6809/konami.cpp index 8dc2bf3ab78..618b298fcc7 100644 --- a/src/devices/cpu/m6809/konami.cpp +++ b/src/devices/cpu/m6809/konami.cpp @@ -65,7 +65,7 @@ March 2013 NPW: //************************************************************************** // turn off 'unreferenced label' errors -#if defined(__GNUC__) && __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) +#if defined(__GNUC__) #pragma GCC diagnostic ignored "-Wunused-label" #endif #ifdef _MSC_VER diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index f9669765db4..30690ed5db5 100644 --- a/src/devices/cpu/m6809/m6809.cpp +++ b/src/devices/cpu/m6809/m6809.cpp @@ -89,8 +89,7 @@ March 2013 NPW: #define LOG_INTERRUPTS 0 // turn off 'unreferenced label' errors -// this pragma doesn't work on older GCCs, so cut off at 4.2 -#if defined(__GNUC__) && __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) +#if defined(__GNUC__) #pragma GCC diagnostic ignored "-Wunused-label" #endif #ifdef _MSC_VER diff --git a/src/emu/inpttype.h b/src/emu/inpttype.h index 79843fdff34..3cacc94bf93 100644 --- a/src/emu/inpttype.h +++ b/src/emu/inpttype.h @@ -20,7 +20,7 @@ typelist.append(*global_alloc(input_type_entry(IPT_##_type, IPG_##_group, (_player == 0) ? _player : (_player) - 1, (_player == 0) ? #_type : ("P" #_player "_" #_type), _name, _seq, _decseq, _incseq))); /* These input port macros expand to a great deal of code and break compilers */ -#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 4 || (__GNUC_MINOR__ == 4 && __GNUC_PATCHLEVEL__ >= 4)))) +#if defined(__GNUC__) #pragma GCC push_options #pragma GCC optimize ("O1") #elif defined(_MSC_VER) @@ -829,7 +829,7 @@ void construct_core_types(simple_list<input_type_entry> &typelist) construct_core_types_OSD(typelist); construct_core_types_invalid(typelist); } -#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 4 || (__GNUC_MINOR__ == 4 && __GNUC_PATCHLEVEL__ >= 4)))) +#if defined(__GNUC__) #pragma GCC pop_options #elif defined(_MSC_VER) #pragma optimize("", on) diff --git a/src/lib/util/delegate.h b/src/lib/util/delegate.h index ec10a5c268d..b576d2f063d 100644 --- a/src/lib/util/delegate.h +++ b/src/lib/util/delegate.h @@ -94,9 +94,8 @@ // select which one we will be using #if defined(__GNUC__) - /* does not work in versions over 4.7.x of 32bit MINGW */ - #if defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) - //#define USE_DELEGATE_TYPE DELEGATE_TYPE_COMPATIBLE + /* 32bit MINGW asks for different convention */ + #if defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__) #define USE_DELEGATE_TYPE DELEGATE_TYPE_INTERNAL #define MEMBER_ABI __thiscall #define HAS_DIFFERENT_ABI 1 |