29 lines
809 B
C++
29 lines
809 B
C++
$NetBSD: patch-src_rcs__file.cc,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/rcs_file.cc.orig 2014-05-04 09:15:17.000000000 +0000
|
|
+++ 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"
|
|
|