diff options
| author | 2015-07-23 10:48:28 -0500 | |
|---|---|---|
| committer | 2015-07-23 10:48:28 -0500 | |
| commit | df2ebdea8d7c261d7e659593df32eaead1bd3fdd (patch) | |
| tree | 926ff9a76669597e7c8b5d1107c738f3502ab6f0 /src/emu/netlist | |
| parent | 9d0e2427a48ac9806f0dd12646b2eaec5dab792a (diff) | |
please bear with me.. these are needed to compile in GCC 5.2 and I want mingw guys to see them. with luck they can be reverted in a couple of days (nw)
Diffstat (limited to 'src/emu/netlist')
| -rw-r--r-- | src/emu/netlist/nl_parser.c | 11 | ||||
| -rw-r--r-- | src/emu/netlist/plib/pconfig.h | 12 | ||||
| -rw-r--r-- | src/emu/netlist/plib/pparser.c | 12 | ||||
| -rw-r--r-- | src/emu/netlist/solver/nld_solver.c | 12 | ||||
| -rw-r--r-- | src/emu/netlist/tools/nl_convert.c | 12 |
5 files changed, 59 insertions, 0 deletions
diff --git a/src/emu/netlist/nl_parser.c b/src/emu/netlist/nl_parser.c index 23ee63d0ee2..06ff0c8e932 100644 --- a/src/emu/netlist/nl_parser.c +++ b/src/emu/netlist/nl_parser.c @@ -9,6 +9,13 @@ #include "nl_factory.h" #include "devices/nld_truthtable.h" +// for now, make buggy GCC/Mingw STFU about I64FMT +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat" +#pragma GCC diagnostic ignored "-Wformat-extra-args" +#endif + //#undef NL_VERBOSE_OUT //#define NL_VERBOSE_OUT(x) printf x @@ -466,3 +473,7 @@ nl_double parser_t::eval_param(const token_t tok) #endif } } + +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic pop +#endif diff --git a/src/emu/netlist/plib/pconfig.h b/src/emu/netlist/plib/pconfig.h index b39701c90e9..45958b85468 100644 --- a/src/emu/netlist/plib/pconfig.h +++ b/src/emu/netlist/plib/pconfig.h @@ -5,6 +5,13 @@ * */ +// for now, make buggy GCC/Mingw STFU about I64FMT +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat" +#pragma GCC diagnostic ignored "-Wformat-extra-args" +#endif + #ifndef PCONFIG_H_ #define PCONFIG_H_ @@ -223,3 +230,8 @@ private: #endif #endif /* PCONFIG_H_ */ + +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic pop +#endif + diff --git a/src/emu/netlist/plib/pparser.c b/src/emu/netlist/plib/pparser.c index 954b9048810..9ea2505c327 100644 --- a/src/emu/netlist/plib/pparser.c +++ b/src/emu/netlist/plib/pparser.c @@ -10,6 +10,13 @@ #include "pparser.h" +// for now, make buggy GCC/Mingw STFU about I64FMT +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat" +#pragma GCC diagnostic ignored "-Wformat-extra-args" +#endif + //#undef NL_VERBOSE_OUT //#define NL_VERBOSE_OUT(x) printf x @@ -480,3 +487,8 @@ pstring ppreprocessor::process(const pstring &contents) } return pstring(ret.cstr()); } + + +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic pop +#endif diff --git a/src/emu/netlist/solver/nld_solver.c b/src/emu/netlist/solver/nld_solver.c index acf9a6fdaae..9bae485e2f9 100644 --- a/src/emu/netlist/solver/nld_solver.c +++ b/src/emu/netlist/solver/nld_solver.c @@ -9,6 +9,14 @@ * the vectorizations fast-math enables pretty expensive */ +// for now, make buggy GCC/Mingw STFU about I64FMT +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat" +#pragma GCC diagnostic ignored "-Wformat-extra-args" +#endif + + //#pragma GCC optimize "-ffast-math" #if 0 #pragma GCC optimize "-ffast-math" @@ -600,3 +608,7 @@ ATTR_COLD void NETLIB_NAME(solver)::post_start() } NETLIB_NAMESPACE_DEVICES_END() + +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic pop +#endif diff --git a/src/emu/netlist/tools/nl_convert.c b/src/emu/netlist/tools/nl_convert.c index 23e5c537b12..bee0c2e8c36 100644 --- a/src/emu/netlist/tools/nl_convert.c +++ b/src/emu/netlist/tools/nl_convert.c @@ -10,6 +10,14 @@ #include <cmath> #include "nl_convert.h" + +// for now, make buggy GCC/Mingw STFU about I64FMT +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat" +#pragma GCC diagnostic ignored "-Wformat-extra-args" +#endif + template<typename Class> static plist_t<int> bubble(const pnamedlist_t<Class *> &sl) { @@ -455,3 +463,7 @@ void nl_convert_eagle_t::convert(const pstring &contents) } } + +#if (defined(__MINGW32__) && (__GNUC__ >= 5)) +#pragma GCC diagnostic pop +#endif |
