]>
Commit | Line | Data |
---|---|---|
e4d2db0f JR |
1 | --- enigma-1.01/lib-src/enigma-core/ecl_util.hh~ 2006-01-20 12:12:12.000000000 +0100 |
2 | +++ enigma-1.01/lib-src/enigma-core/ecl_util.hh 2010-02-06 01:53:10.484390523 +0100 | |
3 | @@ -20,6 +20,7 @@ | |
4 | #define ECL_UTIL_HH_INCLUDED | |
5 | ||
6 | #include <string> | |
7 | +#include <algorithm> | |
8 | ||
9 | /* hide GNU extensions for non-gnu compilers: */ | |
10 | #ifndef __GNU__ | |
11 | diff -Nur enigma-1.01/build-tree/enigma-1.01/src/Utf8ToXML.cc enigma-1.01.new/build-tree/enigma-1.01/src/Utf8ToXML.cc | |
12 | --- enigma-1.01/src/Utf8ToXML.cc 2006-09-03 19:15:33.000000000 +0000 | |
13 | +++ enigma-1.01/src/Utf8ToXML.cc 2008-03-18 04:49:15.000000000 +0000 | |
14 | @@ -21,6 +21,7 @@ | |
15 | #include "main.hh" | |
16 | #include <xercesc/util/XMLString.hpp> | |
17 | #include <xercesc/util/TransService.hpp> | |
18 | +#include <cstring> | |
19 | ||
20 | XERCES_CPP_NAMESPACE_USE | |
21 | ||
22 | diff -Nur enigma-1.01/build-tree/enigma-1.01/src/file.hh enigma-1.01.new/build-tree/enigma-1.01/src/file.hh | |
23 | --- enigma-1.01/src/file.hh 2007-04-03 23:12:49.000000000 +0000 | |
24 | +++ enigma-1.01/src/file.hh 2008-03-18 04:48:51.000000000 +0000 | |
25 | @@ -22,6 +22,7 @@ | |
26 | #include <iosfwd> | |
27 | #include <vector> | |
28 | #include <list> | |
29 | +#include <memory> | |
30 | #include "ecl_error.hh" | |
31 | ||
32 | namespace enigma | |
33 | diff -Nur enigma-1.01/build-tree/enigma-1.01/src/gui/widgets.cc enigma-1.01.new/build-tree/enigma-1.01/src/gui/widgets.cc | |
34 | --- enigma-1.01/src/gui/widgets.cc 2007-05-18 13:14:14.000000000 +0000 | |
35 | +++ enigma-1.01/src/gui/widgets.cc 2008-03-18 04:48:51.000000000 +0000 | |
36 | @@ -28,6 +28,7 @@ | |
37 | #include <cassert> | |
38 | #include <algorithm> | |
39 | #include <iostream> | |
40 | +#include <limits.h> | |
41 | ||
42 | using namespace enigma::gui; | |
43 | using namespace ecl; | |
44 | --- enigma-1.01/src/lua.cc~ 2010-02-06 02:00:59.472140143 +0100 | |
45 | +++ enigma-1.01/src/lua.cc 2010-02-06 02:01:20.695139086 +0100 | |
46 | @@ -572,7 +572,7 @@ | |
47 | int y = round_down<int>(lua_tonumber(L, 2)); | |
48 | const char *dir = lua_tostring(L,3); | |
49 | const char *allowed = "wsen"; | |
50 | - char *found = strchr(allowed, dir[0]); | |
51 | + const char *found = strchr(allowed, dir[0]); | |
52 | ||
53 | if (found && found[0]) | |
54 | world::AddScramble(GridPos(x,y), enigma::Direction(found-allowed)); | |
55 | --- enigma-1.01/src/PropertyManager.cc~ 2007-05-18 15:14:15.000000000 +0200 | |
56 | +++ enigma-1.01/src/PropertyManager.cc 2010-02-06 02:02:45.056139587 +0100 | |
57 | @@ -29,6 +29,7 @@ | |
58 | #include "XMLtoUtf8.hh" | |
59 | #include "ecl_system.hh" | |
60 | #include <iostream> | |
61 | +#include <cstdio> | |
62 | #include <xercesc/dom/DOM.hpp> | |
63 | #include <xercesc/util/XMLDouble.hpp> | |
64 | #include <xercesc/util/XMLString.hpp> | |
65 | --- enigma-1.01/src/StateManager.cc~ 2010-02-06 02:04:34.963140776 +0100 | |
66 | +++ enigma-1.01/src/StateManager.cc 2010-02-06 02:05:55.729138277 +0100 | |
67 | @@ -33,6 +33,7 @@ | |
68 | #include "gui/ErrorMenu.hh" | |
69 | #include <iostream> | |
70 | #include <sstream> | |
71 | +#include <cstdio> | |
72 | #include <xercesc/dom/DOM.hpp> | |
73 | #include <xercesc/util/XMLDouble.hpp> | |
74 | #include <xercesc/util/XMLString.hpp> | |
75 | --- enigma-1.01/src/gui/LevelPackComposer.cc~ 2007-05-18 15:14:14.000000000 +0200 | |
76 | +++ enigma-1.01/src/gui/LevelPackComposer.cc 2010-02-06 02:07:14.662390121 +0100 | |
77 | @@ -16,7 +16,8 @@ | |
78 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
79 | * | |
80 | */ | |
81 | - | |
82 | + | |
83 | +#include <cstdio> | |
84 | #include "gui/LevelPackComposer.hh" | |
85 | #include "gui/HelpMenu.hh" | |
86 | #include "ecl.hh" | |
87 | --- enigma-1.01/src/lev/Index.cc~ 2007-05-22 22:02:53.000000000 +0200 | |
88 | +++ enigma-1.01/src/lev/Index.cc 2010-02-06 02:08:15.873139909 +0100 | |
89 | @@ -16,6 +16,7 @@ | |
90 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
91 | */ | |
92 | ||
93 | +#include <cstdio> | |
94 | #include "lev/Index.hh" | |
95 | #include "lev/VolatileIndex.hh" | |
96 | #include "errors.hh" |