diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-27 14:41:16 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-28 20:53:40 +0200 |
| commit | a3ce60eb3c8bb5c69ab41556398efa8316286477 (patch) | |
| tree | a9600fdf96ab53a1aef150fd9c4a1e8c23b9eb90 /rsc | |
| parent | abfe16cec61eae33c64cb1901f0fc740b0466f60 (diff) | |
We only support MSVC 2008 (_MSC_VER 1500) or later
We can drop or simplify many conditionals.
Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rsclex.hxx | 4 | ||||
| -rw-r--r-- | rsc/source/parser/rsckey.cxx | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx index 838bf845721d..a2ad19f32fb3 100644 --- a/rsc/inc/rsclex.hxx +++ b/rsc/inc/rsclex.hxx @@ -100,11 +100,7 @@ extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion extern "C" void yyerror( const char * ); extern "C" int yylex( void ); #else -#if defined ( GCC ) || (_MSC_VER >= 1400) int yyparse(); // forward Deklaration fuer erzeugte Funktion -#else -yyparse(); // forward Deklaration fuer erzeugte Funktion -#endif void yyerror( char * ); int yylex( void ); #endif diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index dda03cfd1760..6667ee058fe9 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -27,7 +27,7 @@ #include <rschash.hxx> #include <rsckey.hxx> -#if defined(_MSC_VER) && (_MSC_VER >= 1200 ) +#ifdef _MSC_VER #define _cdecl __cdecl #endif |