blob: 636dd5c6b85c7cf89022386febdf34d89d4c1772 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
$NetBSD: patch-src_file__io.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/file_io.cc.orig 2014-05-04 09:15:16.000000000 +0000
+++ src/file_io.cc
@@ -12,9 +12,9 @@
#include <fstream>
#include <botan/botan.h>
-#include "botan_pipe_cache.hh"
#include "file_io.hh"
+#include "botan_pipe_cache.hh"
#include "sanity.hh"
#include "simplestring_xform.hh"
#include "charset.hh"
|
