Check return value of regex_match instead of looking at first match

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

diff --git a/src/support/os_win32.h b/src/support/os_win32.h
index bf748f629ae4d956578b981788d6482c30ae9044..42016f7094eb7f33abe56afd7fb77b4fdcd8d5ee 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 < 0x0500
+#   error WINVER must be >= 0x0500
+#  endif
+# else
+#  define WINVER 0x0500
 # endif
-# define WINVER 0x0500
 # define _WIN32_IE 0x0500
 #endif
 
 #include <windows.h>
+#include <tchar.h>
+#include <psapi.h>
 
 
 namespace lyx {