Fix some warnings

[lyx.git] / src / support / os_win32.h

diff --git a/src/support/os_win32.h b/src/support/os_win32.h
index 77af7fb984e30c8026b9bbd8b67c3e37445020bc..6f92b90abbd28ddca89fe1fe6b9e1816208525d7 100644 (file)
--- 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 < 0x0600
+#   error WINVER must be >= 0x0600
+#  endif
+# else
+#  define WINVER 0x0600
 # endif
-# define WINVER 0x0500
-# define _WIN32_IE 0x0500
+# define _WIN32_IE 0x0600
 #endif
 
 #include <windows.h>
+#include <tchar.h>
+#include <psapi.h>
 
 
 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: