OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix function conflict with win32 headers

Browse Source
This commit is contained in:
branan
2012-02-05 14:51:31 -08:00
parent 6654f41dce
commit 091b90efd2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/Plasma/NucleusLib/pnNetDiag/pnNetSys.cpp
View File

@ -68,7 +68,7 @@ typedef DWORD (PASCAL FAR * FGetAdaptersInfo)(
* *
***/ ***/
static FGetAdaptersInfo GetAdaptersInfo; static FGetAdaptersInfo getAdaptersInfo;
/***************************************************************************** /*****************************************************************************
@ -81,14 +81,14 @@ static FGetAdaptersInfo GetAdaptersInfo;
void SysStartup () { void SysStartup () {
if (g_lib) { if (g_lib) {
GetAdaptersInfo = (FGetAdaptersInfo)GetProcAddress(g_lib, "GetAdaptersInfo"); getAdaptersInfo = (FGetAdaptersInfo)GetProcAddress(g_lib, "GetAdaptersInfo");
} }
} }
//============================================================================ //============================================================================
void SysShutdown () { void SysShutdown () {
GetAdaptersInfo = nil; getAdaptersInfo = nil;
} }
@ -150,17 +150,17 @@ void NetDiagSys (
} }
{ // Adapters { // Adapters
if (!GetAdaptersInfo) { if (!getAdaptersInfo) {
dump(L"[SYS] Failed to load IP helper API"); dump(L"[SYS] Failed to load IP helper API");
callback(diag, kNetProtocolNil, kNetErrNotSupported, param); callback(diag, kNetProtocolNil, kNetErrNotSupported, param);
return; return;
} }
ULONG ulOutBufLen = 0; ULONG ulOutBufLen = 0;
GetAdaptersInfo(nil, &ulOutBufLen); getAdaptersInfo(nil, &ulOutBufLen);
PIP_ADAPTER_INFO pInfo = (PIP_ADAPTER_INFO)malloc(ulOutBufLen); PIP_ADAPTER_INFO pInfo = (PIP_ADAPTER_INFO)malloc(ulOutBufLen);
PIP_ADAPTER_INFO pAdapter; PIP_ADAPTER_INFO pAdapter;
if (GetAdaptersInfo(pInfo, &ulOutBufLen) == NO_ERROR) { if (getAdaptersInfo(pInfo, &ulOutBufLen) == NO_ERROR) {
pAdapter = pInfo; pAdapter = pInfo;
while (pAdapter) { while (pAdapter) {
dump(L"[SYS] NIC: %S", pAdapter->Description); dump(L"[SYS] NIC: %S", pAdapter->Description);