46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From fb3d17cec9ee8be9b7ac2582b39aad5db474f0da Mon Sep 17 00:00:00 2001
|
|
From: Yonghong Song <yhs@fb.com>
|
|
Date: Thu, 2 Jan 2020 09:20:07 -0800
|
|
Subject: [PATCH] fix test_map_in_map.cc compilation error
|
|
|
|
fix issue #2679 where test_map_in_map.cc has a
|
|
compilation error on ppc64le due to conflicting
|
|
type __u64. Let us just remove the typedef.
|
|
|
|
Signed-off-by: Yonghong Song <yhs@fb.com>
|
|
---
|
|
tests/cc/test_map_in_map.cc | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tests/cc/test_map_in_map.cc b/tests/cc/test_map_in_map.cc
|
|
index 76c07f77f..f8c1a0b66 100644
|
|
--- a/tests/cc/test_map_in_map.cc
|
|
+++ b/tests/cc/test_map_in_map.cc
|
|
@@ -22,7 +22,6 @@
|
|
#include "catch.hpp"
|
|
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
|
-typedef unsigned long long __u64;
|
|
|
|
TEST_CASE("test hash of maps", "[hash_of_maps]") {
|
|
{
|
|
@@ -67,7 +66,7 @@ TEST_CASE("test hash of maps", "[hash_of_maps]") {
|
|
auto t = bpf.get_map_in_map_table("maps_hash");
|
|
auto ex1_table = bpf.get_array_table<int>("ex1");
|
|
auto ex2_table = bpf.get_array_table<int>("ex2");
|
|
- auto ex3_table = bpf.get_array_table<__u64>("ex3");
|
|
+ auto ex3_table = bpf.get_array_table<unsigned long long>("ex3");
|
|
int ex1_fd = ex1_table.get_fd();
|
|
int ex2_fd = ex2_table.get_fd();
|
|
int ex3_fd = ex3_table.get_fd();
|
|
@@ -162,7 +161,8 @@ TEST_CASE("test array of maps", "[array_of_maps]") {
|
|
auto t = bpf.get_map_in_map_table("maps_array");
|
|
auto ex1_table = bpf.get_hash_table<int, int>("ex1");
|
|
auto ex2_table = bpf.get_hash_table<int, int>("ex2");
|
|
- auto ex3_table = bpf.get_hash_table<__u64, __u64>("ex3");
|
|
+ auto ex3_table =
|
|
+ bpf.get_hash_table<unsigned long long, unsigned long long>("ex3");
|
|
int ex1_fd = ex1_table.get_fd();
|
|
int ex2_fd = ex2_table.get_fd();
|
|
int ex3_fd = ex3_table.get_fd();
|