From ddd1d19b3fbf6731eb5339d5834f7f519caeae39 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Fri, 20 Oct 2023 13:03:59 +0200 Subject: [PATCH] [TASKMGR] Get rid of cplusplus extern c (#5808) The others in graphctrl.h and graph.h are being handled in the yet-uncommitted PR #5343. --- base/applications/taskmgr/perfdata.h | 15 +++------------ base/applications/taskmgr/perfpage.h | 10 +--------- base/applications/taskmgr/taskmgr.h | 23 +---------------------- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/base/applications/taskmgr/perfdata.h b/base/applications/taskmgr/perfdata.h index 3da4a0fef2b..0a06c4d5cf2 100644 --- a/base/applications/taskmgr/perfdata.h +++ b/base/applications/taskmgr/perfdata.h @@ -1,17 +1,13 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Counters. + * PURPOSE: Performance Counters * COPYRIGHT: Copyright 1999-2001 Brian Palmer * Copyright 2014 Ismael Ferreras Morezuelas */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + (double)((x).LowPart)) typedef struct _PERFDATA @@ -43,9 +39,9 @@ typedef struct _PERFDATA typedef struct _CMD_LINE_CACHE { - DWORD idx; + DWORD idx; LPWSTR str; - ULONG len; + ULONG len; struct _CMD_LINE_CACHE* pnext; } CMD_LINE_CACHE, *PCMD_LINE_CACHE; @@ -99,8 +95,3 @@ ULONG PerfDataGetPhysicalMemorySystemCacheK(void); ULONG PerfDataGetSystemHandleCount(void); ULONG PerfDataGetTotalThreadCount(void); - - -#ifdef __cplusplus -}; -#endif diff --git a/base/applications/taskmgr/perfpage.h b/base/applications/taskmgr/perfpage.h index e581bd39c3e..fcf270eece3 100644 --- a/base/applications/taskmgr/perfpage.h +++ b/base/applications/taskmgr/perfpage.h @@ -1,16 +1,12 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Page. + * PURPOSE: Performance Page * COPYRIGHT: Copyright 1999-2001 Brian Palmer */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - extern HWND hPerformancePage; /* Performance Property Page */ INT_PTR CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); @@ -18,7 +14,3 @@ void RefreshPerformancePage(void); void PerformancePage_OnViewShowKernelTimes(void); void PerformancePage_OnViewCPUHistoryOneGraphAll(void); void PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void); - -#ifdef __cplusplus -}; -#endif diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index e65ef30221f..fe387718c40 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -1,29 +1,12 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Main Header. + * PURPOSE: Main Header * COPYRIGHT: Copyright 1999-2001 Brian Palmer */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef _MSC_VER -/*MF -typedef struct _IO_COUNTERS { - ULONGLONG ReadOperationCount; - ULONGLONG WriteOperationCount; - ULONGLONG OtherOperationCount; - ULONGLONG ReadTransferCount; - ULONGLONG WriteTransferCount; - ULONGLONG OtherTransferCount; -} IO_COUNTERS, *PIO_COUNTERS; -*/ -#endif /* _MSC_VER */ - #include "resource.h" #define RUN_APPS_PAGE @@ -100,7 +83,3 @@ void TaskManager_OnTabWndSelChange(void); VOID ShowWin32Error(DWORD dwError); LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread); - -#ifdef __cplusplus -} -#endif