SecBSD's official ports repository

devel/monotone/patches/patch-src_netcmd_hh

@@ -0,0 +1,26 @@
+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. From Fedora.
+
+Index: src/netcmd.hh
+--- src/netcmd.hh.orig
++++ src/netcmd.hh
+@@ -10,13 +10,13 @@
+ #ifndef __NETCMD_HH__
+ #define __NETCMD_HH__
+ 
+-#include "vector.hh"
+ #include <list>
+ #include <utility>
+ #include <iostream>
+ 
+-#include "globish.hh"
+ #include "merkle_tree.hh"
++#include "vector.hh"
++#include "globish.hh"
+ #include "numeric_vocab.hh"
+ #include "uri.hh"
+ #include "vocab.hh"