Hi, sorry, I didn't see this patch, and committed a different patch (c8b1906cf59d73a7cb39926c53dc4e136611d4f5) at about the same time, doing the same thing in a different way.
-- Nadav Har'El n...@scylladb.com On Tue, Aug 29, 2017 at 11:37 AM, Justin Cinkelj <justin.cink...@xlab.si> wrote: > iperf failed to compile on Fedora 25, gcc 6.3, with: > In file included from /usr/include/c++/6.3.1/cmath:42:0, > from /usr/include/c++/6.3.1/math.h:36, > from ../include/headers.h:85, > from ../include/Timestamp.hpp:63, > from delay.cpp:53: > /usr/include/c++/6.3.1/bits/cpp_type_traits.h:205:12: error: redefinition of > ‘struct std::__is_integer<int>’ > struct __is_integer<int> > /*---------------------------------------------------------------*/ > ^~~~~~~~~~~~~~~~~ > /usr/include/c++/6.3.1/bits/cpp_type_traits.h:138:12: error: previous > definition of ‘struct std::__is_integer<int>’ > struct __is_integer<bool> > /*------------------------------------------------------------------------------*/ > ^~~~~~~~~~~~~~~~~~ > > Problem is due to checking for sizeof(bool) with gcc (not g++). > Workaround is to comment out '#define bool int' in generated config.h. > > Also add .gitignore > > Fixes #55 > > Signed-off-by: Justin Cinkelj <justin.cink...@xlab.si> > --- > iperf/.gitignore | 3 +++ > iperf/Makefile | 1 + > 2 files changed, 4 insertions(+) > create mode 100644 iperf/.gitignore > > diff --git a/iperf/.gitignore b/iperf/.gitignore > new file mode 100644 > index 0000000..4939ce0 > --- /dev/null > +++ b/iperf/.gitignore > @@ -0,0 +1,3 @@ > +iperf-[0-9\.]*/ > +iperf-[0-9\.]*.tar.gz > +iperf > diff --git a/iperf/Makefile b/iperf/Makefile > index 6a79af1..d956050 100644 > --- a/iperf/Makefile > +++ b/iperf/Makefile > @@ -18,6 +18,7 @@ $(iperfv)/src/iperf: $(tarball) > tar xzf $^ > patch -p0 < so.patch > cd $(iperfv) && CFLAGS='-fPIC -g' CXXFLAGS='-fPIC -g' ./configure > + cd $(iperfv) && sed -i 's|^#define bool int|// #define bool int|' > config.h > +$(MAKE) -C $(iperfv) > > $(tarball): > -- > 2.9.4 > > -- > You received this message because you are subscribed to the Google Groups > "OSv Development" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to osv-dev+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to osv-dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
