diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-20 20:20:44 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-22 20:53:30 +0200 |
| commit | eef4c133e9649ebd690918bd7b83c2d5dc0dfcff (patch) | |
| tree | 1a8d084c5b16056a15258770a05b9cd2d53a40bc /include | |
| parent | bb406680cebd6fa1e1bdb9e2de430cd9a1f44da0 (diff) | |
Windows: avoid dependence on UNICODE define; prefer W functions
Change-Id: I95b90128e93f0d88ed73601bcc5a7ca9279d4cf1
Reviewed-on: https://gerrit.libreoffice.org/42560
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/systools/win32/qswin32.h | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/include/systools/win32/qswin32.h b/include/systools/win32/qswin32.h index 3cee187e6818..d9c386e17bdd 100644 --- a/include/systools/win32/qswin32.h +++ b/include/systools/win32/qswin32.h @@ -20,29 +20,9 @@ #ifndef INCLUDED_SYSTOOLS_WIN32_QSWIN32_H #define INCLUDED_SYSTOOLS_WIN32_QSWIN32_H -#define QUICKSTART_CLASSNAMEA "LO Listener Class" -#define QUICKSTART_WINDOWNAMEA "LO Listener Window" -#define SHUTDOWN_QUICKSTART_MESSAGEA "LO KillTray" - -#define QUICKSTART_CLASSNAMEW L##QUICKSTART_CLASSNAMEA -#define QUICKSTART_WINDOWNAMEW L##QUICKSTART_WINDOWNAMEA -#define SHUTDOWN_QUICKSTART_MESSAGEW L##SHUTDOWN_QUICKSTART_MESSAGEA - -#ifdef UNICODE -# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEW -# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEW -# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEW -# ifndef FindWindow -# define FindWindow FindWindowW -# endif -#else -# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEA -# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEA -# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEA -# ifndef FindWindow -# define FindWindow FindWindowA -# endif -#endif +#define QUICKSTART_CLASSNAME L"LO Listener Class" +#define QUICKSTART_WINDOWNAME L"LO Listener Window" +#define SHUTDOWN_QUICKSTART_MESSAGE L"LO KillTray" #endif // INCLUDED_SYSTOOLS_WIN32_QSWIN32_H |