X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_win32.h;h=42016f7094eb7f33abe56afd7fb77b4fdcd8d5ee;hb=1410eeb10e4ce1549ce381ab7ae85847c442c41f;hp=77af7fb984e30c8026b9bbd8b67c3e37445020bc;hpb=e4c676a4905c38aa0aa2f7c0d490bf841beee05d;p=lyx.git diff --git a/src/support/os_win32.h b/src/support/os_win32.h index 77af7fb984..42016f7094 100644 --- a/src/support/os_win32.h +++ b/src/support/os_win32.h @@ -35,14 +35,19 @@ * Note: __CYGWIN__ can be defined here if building in _WIN32 mode. */ #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__CYGWIN32__) -# if defined(WINVER) && WINVER < 0x0500 -# error WINVER must be >= 0x0500 +# if defined(WINVER) +# if WINVER < 0x0500 +# error WINVER must be >= 0x0500 +# endif +# else +# define WINVER 0x0500 # endif -# define WINVER 0x0500 # define _WIN32_IE 0x0500 #endif #include +#include +#include namespace lyx { @@ -74,7 +79,7 @@ public: ~GetFolderPath(); /** Wrapper for SHGetFolderPathA, returning - * the path asscociated with @c id. + * the path asscociated with @c id in utf8 encoding. */ std::string const operator()(folder_id id) const; private: