$NetBSD: patch-src_option.hh,v 1.1 2021/03/06 08:57:54 nia Exp $ A function macro named E clashes with internal boost definitions. Rearrange the order of header inclusion so that affected boost headers are included before monotone defines the macro. Also, stop bundling boost/circular_buffer, which is available in current versions of boost. https://src.fedoraproject.org/fork/jjames/rpms/monotone/raw/84e80f1b992f0b0dba6cfe98eb9d0c55ea39623f/f/monotone-1.1-boost.patch --- src/option.hh.orig 2014-05-04 09:15:17.000000000 +0000 +++ src/option.hh @@ -22,9 +22,9 @@ #include #include #include -#include "vector.hh" - #include + +#include "vector.hh" #include "lexical_cast.hh" #include "sanity.hh"