SecBSD's official ports repository
This commit is contained in:
commit
2c0afcbbf3
64331 changed files with 5339189 additions and 0 deletions
26
devel/monotone/patches/patch-src_rcs_file_cc
Normal file
26
devel/monotone/patches/patch-src_rcs_file_cc
Normal file
|
@ -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/rcs_file.cc
|
||||
--- src/rcs_file.cc.orig
|
||||
+++ src/rcs_file.cc
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "base.hh"
|
||||
#include <fstream>
|
||||
-#include "vector.hh"
|
||||
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
@@ -32,6 +31,7 @@
|
||||
#endif
|
||||
|
||||
#include "rcs_file.hh"
|
||||
+#include "vector.hh"
|
||||
#include "sanity.hh"
|
||||
#include "char_classifiers.hh"
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue