From fdf4432356ddb597f46cfb7b047ab4e0bb808ba2 Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Thu, 14 Nov 2024 23:04:10 +0000 Subject: [PATCH] libprocessgroup: Remove __BEGIN_DECLS and __END_DECLS These macros have been useless in this file since commit 82b72a566 ("libprocessgroup: Add support for task profiles") in 2018 which added C++ includes, and C++ types and keywords inside an extern "C" block. Change-Id: Iae1cbfcc5cb974034d88fb466b79088496190940 --- libprocessgroup/include/processgroup/processgroup.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libprocessgroup/include/processgroup/processgroup.h b/libprocessgroup/include/processgroup/processgroup.h index d27b56895..6a026a717 100644 --- a/libprocessgroup/include/processgroup/processgroup.h +++ b/libprocessgroup/include/processgroup/processgroup.h @@ -16,7 +16,6 @@ #pragma once -#include #include #include #include @@ -24,8 +23,6 @@ #include #include -__BEGIN_DECLS - static constexpr std::string CGROUPV2_HIERARCHY_NAME = "cgroup2"; bool CgroupsAvailable(); @@ -39,8 +36,6 @@ bool SetTaskProfiles(pid_t tid, const std::vector& profiles, bool SetProcessProfiles(uid_t uid, pid_t pid, const std::vector& profiles); bool SetUserProfiles(uid_t uid, const std::vector& profiles); -__END_DECLS - bool SetTaskProfiles(pid_t tid, std::initializer_list profiles, bool use_fd_cache = false); bool SetProcessProfiles(uid_t uid, pid_t pid, std::initializer_list profiles); @@ -50,7 +45,6 @@ bool SetTaskProfiles(pid_t tid, std::span profiles, bool SetProcessProfiles(uid_t uid, pid_t pid, std::span profiles); #endif -__BEGIN_DECLS #ifndef __ANDROID_VNDK__ @@ -96,5 +90,3 @@ bool getAttributePathForTask(const std::string& attr_name, pid_t tid, std::strin bool isProfileValidForProcess(const std::string& profile_name, uid_t uid, pid_t pid); #endif // __ANDROID_VNDK__ - -__END_DECLS