diff options
| author | nyamatongwe <nyamatongwe@gmail.com> | 2013-07-03 16:14:42 -0700 |
|---|---|---|
| committer | nyamatongwe <nyamatongwe@gmail.com> | 2013-07-03 16:14:42 -0700 |
| commit | ad47e7b7dede353fa3c99ecdf4925e1efb32c2b4 (patch) | |
| tree | 138d7aeb92f80b1b1a9c1a3ea7d3d4fbb341d8ad | |
| parent | 44730cd009d5b1ef0c1cbe3fa6fa423cd422fe78 (diff) | |
| download | scintilla-mirror-ad47e7b7dede353fa3c99ecdf4925e1efb32c2b4.tar.gz | |
Hide deprecation warning for GetVersionEx.
| -rw-r--r-- | win32/PlatWin.cxx | 10 |
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); |