]>
Commit | Line | Data |
---|---|---|
8fa5c2e4 JB |
1 | --- xbmc-16.1-Jarvis/xbmc/filesystem/FTPParse.cpp.orig 2016-04-24 08:48:30.000000000 +0200 |
2 | +++ xbmc-16.1-Jarvis/xbmc/filesystem/FTPParse.cpp 2017-12-11 17:11:03.079955624 +0100 | |
3 | @@ -34,6 +34,8 @@ | |
4 | #include <cmath> | |
5 | #include "FTPParse.h" | |
3b89f97e | 6 | |
8fa5c2e4 JB |
7 | +using std::string; |
8 | + | |
9 | CFTPParse::CFTPParse() | |
10 | { | |
11 | m_flagtrycwd = 0; | |
12 | --- xbmc-16.1-Jarvis/lib/cximage-6.0/CxImage/ximadsp.cpp.orig 2016-04-24 08:48:30.000000000 +0200 | |
13 | +++ xbmc-16.1-Jarvis/lib/cximage-6.0/CxImage/ximadsp.cpp 2017-12-11 18:34:55.026753161 +0100 | |
14 | @@ -3,12 +3,14 @@ | |
15 | * CxImage version 6.0.0 02/Feb/2008 | |
16 | */ | |
3b89f97e | 17 | |
8fa5c2e4 JB |
18 | +#if CXIMAGE_SUPPORT_DSP |
19 | +// include <queue> before any local headers, as they define min/max as macros | |
20 | +#include <queue> | |
21 | + | |
22 | #include "ximage.h" | |
23 | ||
24 | #include "ximaiter.h" | |
25 | ||
26 | -#if CXIMAGE_SUPPORT_DSP | |
27 | - | |
28 | //////////////////////////////////////////////////////////////////////////////// | |
29 | /** | |
30 | * Converts the image to B&W. | |
31 | @@ -3477,7 +3479,6 @@ | |
32 | } | |
33 | ||
34 | //////////////////////////////////////////////////////////////////////////////// | |
35 | -#include <queue> | |
36 | //////////////////////////////////////////////////////////////////////////////// | |
37 | /** | |
38 | * Flood Fill |