From 70c85f62dfeb4d343944241a30863f2db66ea419 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Fri, 14 Aug 2020 13:25:51 -0700 Subject: [PATCH] fix: Unbreak build on CentOS 6. (#1040) The fix eliminates a duplicate definition of the iperf_size_t datatype when both iperf.h and iperf_api.h are included. Fixes #1039. --- src/iperf.h | 2 ++ src/iperf_api.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/iperf.h b/src/iperf.h index 6201a07..5b1da46 100644 --- a/src/iperf.h +++ b/src/iperf.h @@ -68,7 +68,9 @@ #include #endif // HAVE_SSL +#if !defined(__IPERF_API_H) typedef uint64_t iperf_size_t; +#endif // __IPERF_API_H struct iperf_interval_results { diff --git a/src/iperf_api.h b/src/iperf_api.h index 63228d9..a51b773 100644 --- a/src/iperf_api.h +++ b/src/iperf_api.h @@ -45,7 +45,9 @@ struct iperf_interval_results; struct iperf_stream; struct iperf_time; +#if !defined(__IPERF_H) typedef uint64_t iperf_size_t; +#endif // __IPERF_H /* default settings */ #define Ptcp SOCK_STREAM