header file cleanup am: 23c436f957 am: da9fb11f0e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1557257
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie663ca05bd940faedbf7326f479170419974b165
diff --git a/libbpf_android/include/bpf/BpfMap.h b/libbpf_android/include/bpf/BpfMap.h
index 3e7413e..c42801a 100644
--- a/libbpf_android/include/bpf/BpfMap.h
+++ b/libbpf_android/include/bpf/BpfMap.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef BPF_BPFMAP_H
-#define BPF_BPFMAP_H
+#pragma once
#include <linux/bpf.h>
@@ -258,5 +257,3 @@
} // namespace bpf
} // namespace android
-
-#endif
diff --git a/libbpf_android/include/bpf/BpfUtils.h b/libbpf_android/include/bpf/BpfUtils.h
index e67f664..413d3ff 100644
--- a/libbpf_android/include/bpf/BpfUtils.h
+++ b/libbpf_android/include/bpf/BpfUtils.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef BPF_BPFUTILS_H
-#define BPF_BPFUTILS_H
+#pragma once
#include <linux/if_ether.h>
#include <net/if.h>
@@ -34,8 +33,6 @@
constexpr const uint64_t NONEXISTENT_COOKIE = 0;
-constexpr const int MINIMUM_API_REQUIRED = 28;
-
uint64_t getSocketCookie(int sockFd);
int synchronizeKernelRCU();
int setrlimitForTest();
@@ -68,5 +65,3 @@
} // namespace bpf
} // namespace android
-
-#endif
diff --git a/libbpf_android/include/libbpf_android.h b/libbpf_android/include/libbpf_android.h
index a2f78b4..b1c6a0c 100644
--- a/libbpf_android/include/libbpf_android.h
+++ b/libbpf_android/include/libbpf_android.h
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-#ifndef LIBBPF_SYSTEM_H
-#define LIBBPF_SYSTEM_H
+#pragma once
#include <libbpf.h>
#include <linux/bpf.h>
@@ -32,5 +31,3 @@
} // namespace bpf
} // namespace android
-
-#endif