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.
Этот коммит содержится в:
родитель
e551fbcfc2
Коммит
70c85f62df
@ -68,7 +68,9 @@
|
|||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#endif // HAVE_SSL
|
#endif // HAVE_SSL
|
||||||
|
|
||||||
|
#if !defined(__IPERF_API_H)
|
||||||
typedef uint64_t iperf_size_t;
|
typedef uint64_t iperf_size_t;
|
||||||
|
#endif // __IPERF_API_H
|
||||||
|
|
||||||
struct iperf_interval_results
|
struct iperf_interval_results
|
||||||
{
|
{
|
||||||
|
@ -45,7 +45,9 @@ struct iperf_interval_results;
|
|||||||
struct iperf_stream;
|
struct iperf_stream;
|
||||||
struct iperf_time;
|
struct iperf_time;
|
||||||
|
|
||||||
|
#if !defined(__IPERF_H)
|
||||||
typedef uint64_t iperf_size_t;
|
typedef uint64_t iperf_size_t;
|
||||||
|
#endif // __IPERF_H
|
||||||
|
|
||||||
/* default settings */
|
/* default settings */
|
||||||
#define Ptcp SOCK_STREAM
|
#define Ptcp SOCK_STREAM
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user