diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-30 08:30:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-30 08:31:10 +0300 |
| commit | d6d896a121c0bab3ac27fafa5a4e810e48ec96c6 (patch) | |
| tree | 0319c840de8dcf84b313f5603181a62172afcb30 /sdext | |
| parent | 64ed03c90e60be212653b7ed351374ea006f9f57 (diff) | |
WaE: 'SAL_OVERRIDE' macro redefined
Change-Id: Ic8af47b52b06ef440b3fdaa966075780fb7a609b
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 7599adb01422..2daa5b896d29 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_PDFI_OUTDEV_HXX #define INCLUDED_PDFI_OUTDEV_HXX +#include <sal/types.h> + #if defined __GNUC__ #pragma GCC system_header #elif defined __SUNPRO_CC @@ -46,12 +48,6 @@ #pragma warning(pop) #endif -#if HAVE_CXX11_OVERRIDE -#define SAL_OVERRIDE override -#else -#define SAL_OVERRIDE -#endif - #include <boost/unordered_map.hpp> #include <vector> |