aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <nyamatongwe@gmail.com>2013-07-03 16:14:42 -0700
committernyamatongwe <nyamatongwe@gmail.com>2013-07-03 16:14:42 -0700
commita2b232e2659a3543f490d45b84e7b3146e0c1f24 (patch)
treef3b6d4b98f83e94316599b3893f80832e83272ff
parent81589cf492c0499e9a0674b2641e5a708603be05 (diff)
downloadscintilla-mirror-a2b232e2659a3543f490d45b84e7b3146e0c1f24.tar.gz
Hide deprecation warning for GetVersionEx.
-rw-r--r--win32/PlatWin.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index a4b84dc8c..3706c2bc0 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -3205,6 +3205,12 @@ int Platform::Clamp(int val, int minVal, int maxVal) {
return val;
}
+#ifdef _MSC_VER
+// GetVersionEx has been deprecated fro Windows 8.1 but called here to determine if Windows 9x.
+// Too dangerous to find alternate check.
+#pragma warning(disable: 4996)
+#endif
+
void Platform_Initialise(void *hInstance) {
OSVERSIONINFO osv = {sizeof(OSVERSIONINFO),0,0,0,0,TEXT("")};
::GetVersionEx(&osv);
@@ -3231,6 +3237,10 @@ void Platform_Initialise(void *hInstance) {
ListBoxX_Register();
}
+#ifdef _MSC_VER
+#pragma warning(default: 4996)
+#endif
+
void Platform_Finalise() {
if (reverseArrowCursor != NULL)
::DestroyCursor(reverseArrowCursor);