blob: e2f1f7085c7b6667b5c8b98ecd9989e57acf2cc4 (
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
25
26
27
28
29
30
|
$NetBSD: patch-src_charset.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/charset.cc.orig 2014-05-04 09:15:16.000000000 +0000
+++ src/charset.cc
@@ -7,13 +7,13 @@
// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE.
-#include "base.hh"
-#include "vector.hh"
-
#include <boost/tokenizer.hpp>
#include <idna.h>
#include <stringprep.h>
+#include "base.hh"
+#include "vector.hh"
+
#include "charset.hh"
#include "numeric_vocab.hh"
#include "sanity.hh"
|
