Skip to content

Commit 9fd1766

Browse files
committed
Bug #33975638: Enable the deprecation warnings on windows
5. Removed some stale Win98 support code also from NDB win serv lib. Change-Id: I3519a85bd683b12fe741386fa6defdaf3dd28c08
1 parent 40ddfdf commit 9fd1766

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

storage/ndb/src/common/portlib/ndb_nt_servc.cc

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Copyright Abandoned 1998 Irena Pancirov - Irnet Snc
88
This file is public domain and comes with NO WARRANTY of any kind
99
10-
Modifications Copyright (c) 2017, 2021, Oracle and/or its affiliates.
10+
Modifications Copyright (c) 2017, 2022, Oracle and/or its affiliates.
1111
All rights reserved.
1212
*/
1313
#include <windows.h>
@@ -24,8 +24,6 @@ static NTService *pService;
2424
-------------------------------------------------------------------------- */
2525
NTService::NTService()
2626
{
27-
28-
bOsNT = false;
2927
//service variables
3028
ServiceName = NULL;
3129
hExitEvent = 0;
@@ -63,23 +61,6 @@ NTService::~NTService()
6361
{
6462
if (ServiceName != NULL) delete[] ServiceName;
6563
}
66-
/* ------------------------------------------------------------------------
67-
68-
-------------------------------------------------------------------------- */
69-
70-
BOOL NTService::GetOS()
71-
{
72-
bOsNT = false;
73-
memset(&osVer, 0, sizeof(OSVERSIONINFO));
74-
osVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
75-
if (GetVersionEx(&osVer))
76-
{
77-
if (osVer.dwPlatformId == VER_PLATFORM_WIN32_NT)
78-
bOsNT = true;
79-
}
80-
return bOsNT;
81-
}
82-
8364

8465
/**
8566
Registers the main service thread with the service manager.
@@ -574,4 +555,4 @@ BOOL NTService::is_super_user()
574555
}
575556
FreeSid(psidAdministrators);
576557
return ret_value;
577-
}
558+
}

0 commit comments

Comments
 (0)