diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-12 19:35:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-12 19:35:26 +0300 |
| commit | 265ae345c01335a4d9d28bd23b86c43705062497 (patch) | |
| tree | 4153e0c2f5f51d21e358c5c46b08abe1de6f6876 | |
| parent | 2c096cb5b0154a94b7c8a59d1e7c7943ac699910 (diff) | |
Bin obsolete CDECL crack
Change-Id: I69da428711681d14fd48c198fbce0bb545665b5a
| -rw-r--r-- | comphelper/source/misc/syntaxhighlight.cxx | 2 | ||||
| -rw-r--r-- | include/comphelper/syntaxhighlight.hxx | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 11cfc341bceb..c1f4ca5f19ac 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -224,7 +224,7 @@ static const char* strListSqlKeyWords[] = { }; -extern "C" int CDECL compare_strings( const void *arg1, const void *arg2 ) +static int compare_strings( const void *arg1, const void *arg2 ) { return strcmp( (char *)arg1, *(char **)arg2 ); } diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx index ef1a9486a6bf..dfea10f787e3 100644 --- a/include/comphelper/syntaxhighlight.hxx +++ b/include/comphelper/syntaxhighlight.hxx @@ -24,23 +24,10 @@ #include <comphelper/comphelperdllapi.h> - -#if defined CDECL -#undef CDECL -#endif - -// for the bsearch -#ifdef WNT -#define CDECL _cdecl -#endif -#if defined(UNX) -#define CDECL -#endif #ifdef UNX #include <sys/resource.h> #endif - // Token-Typen TT_... enum TokenTypes { |