diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-24 11:15:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-24 13:05:47 +0000 |
| commit | 26448d4bb94c77fa431daed940260f2636c7c218 (patch) | |
| tree | 4fcca25e13e1529e97649fbe96052cf283ddfc0b /sfx2 | |
| parent | 1f2bccf2d28d4257aa0e325658d35182367b59d9 (diff) | |
Just include sal/types.h nowadays
Change-Id: Ic8f6322854ff0ac25c34cd9286545c8aaa27d03b
Reviewed-on: https://gerrit.libreoffice.org/35628
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/syspathw32.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx index ad0e244660a7..c190a7e159bd 100644 --- a/sfx2/source/doc/syspathw32.cxx +++ b/sfx2/source/doc/syspathw32.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <sal/types.h> #ifdef _WIN32 #ifdef _MSC_VER @@ -55,18 +58,6 @@ static bool SHGetSpecialFolderW32( int nFolderID, WCHAR* pszFolder, int nSize ) #endif -// Copied from sal/types.h to circumvent problems with precompiled headers -// and redefinitions of BOOL, INT32 and other types. Unfortunately tools -// also define these type incompatible with Win32 types which leads from -// time to very nasty compilation errors. If someone finds a better -// way to solve these probs please remove this copied part! -typedef unsigned short sal_uInt16; -#if defined(_WIN32) - typedef wchar_t sal_Unicode; -#else - typedef sal_uInt16 sal_Unicode; -#endif - bool GetUserTemplateLocation(sal_Unicode* pFolder, int nSize) { #ifdef _WIN32 |