]> git.pld-linux.org Git - packages/celestia.git/blame - celestia-gcc43.patch
projects / packages / celestia.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- use lua51 not lua50
[packages/celestia.git] / celestia-gcc43.patch
CommitLineData
14640810
KK		 1Marek Mahut <mmahut@fedoraproject.org>: Fix problems with compilation under gcc 4.3
2
3diff -Naur celestia-1.5.0-upstream/src/buildstardb.cpp celestia-1.5.0/src/buildstardb.cpp
4--- celestia-1.5.0-upstream/src/buildstardb.cpp 2008-03-01 12:51:20.000000000 +0100
5+++ celestia-1.5.0/src/buildstardb.cpp 2008-03-01 08:52:23.000000000 +0100
6@@ -17,6 +17,7 @@
7 #include <assert.h>
8 #include <unistd.h>
9 #include "celengine/stardb.h"
10+#include <libintl.h>
11
12 using namespace std;
13
14diff -Naur celestia-1.5.0-upstream/src/celengine/asterism.cpp celestia-1.5.0/src/celengine/asterism.cpp
15--- celestia-1.5.0-upstream/src/celengine/asterism.cpp 2008-03-01 12:51:20.000000000 +0100
16+++ celestia-1.5.0/src/celengine/asterism.cpp 2008-03-01 09:23:23.000000000 +0100
17@@ -8,6 +8,7 @@
18 // of the License, or (at your option) any later version.
19
20 #include <algorithm>
21+#include <libintl.h>
22
23 #ifndef _WIN32
24 #ifndef TARGET_OS_MAC
25diff -Naur celestia-1.5.0-upstream/src/celengine/astro.cpp celestia-1.5.0/src/celengine/astro.cpp
26--- celestia-1.5.0-upstream/src/celengine/astro.cpp 2008-03-01 12:51:20.000000000 +0100
27+++ celestia-1.5.0/src/celengine/astro.cpp 2008-03-01 09:14:33.000000000 +0100
28@@ -10,12 +10,14 @@
29 #include <cmath>
30 #include <iomanip>
31 #include <cstdio>
32+#include <cstring>
33 #include <time.h>
34 #include <celutil/basictypes.h>
35 #include <celmath/mathlib.h>
36 #include "celestia.h"
37 #include "astro.h"
38 #include <celutil/util.h>
39+#include <libintl.h>
40
41 using namespace std;
42
43diff -Naur celestia-1.5.0-upstream/src/celengine/body.cpp celestia-1.5.0/src/celengine/body.cpp
44--- celestia-1.5.0-upstream/src/celengine/body.cpp 2008-03-01 12:51:20.000000000 +0100
45+++ celestia-1.5.0/src/celengine/body.cpp 2008-03-01 09:34:10.000000000 +0100
46@@ -14,6 +14,7 @@
47 #include <celmath/mathlib.h>
48 #include <celutil/util.h>
49 #include <celutil/utf8.h>
50+#include <libintl.h>
51 #include "mesh.h"
52 #include "meshmanager.h"
53 #include "body.h"
54diff -Naur celestia-1.5.0-upstream/src/celengine/cmdparser.cpp celestia-1.5.0/src/celengine/cmdparser.cpp
55--- celestia-1.5.0-upstream/src/celengine/cmdparser.cpp 2008-03-01 12:51:20.000000000 +0100
56+++ celestia-1.5.0/src/celengine/cmdparser.cpp 2008-03-01 08:52:32.000000000 +0100
57@@ -30,6 +30,7 @@
58 #include "astro.h"
59 #include "cmdparser.h"
60 #include "glcontext.h"
61+#include <libintl.h>
62
63 using namespace std;
64
65diff -Naur celestia-1.5.0-upstream/src/celengine/console.cpp celestia-1.5.0/src/celengine/console.cpp
66--- celestia-1.5.0-upstream/src/celengine/console.cpp 2008-03-01 12:51:20.000000000 +0100
67+++ celestia-1.5.0/src/celengine/console.cpp 2008-03-01 08:50:23.000000000 +0100
68@@ -10,6 +10,7 @@
69 #include <cstdarg>
70 #include <cstdio>
71 #include <cassert>
72+#include <cstring>
73 #include "celutil/utf8.h"
74 #include "gl.h"
75 #include "vecgl.h"
76diff -Naur celestia-1.5.0-upstream/src/celengine/dds.cpp celestia-1.5.0/src/celengine/dds.cpp
77--- celestia-1.5.0-upstream/src/celengine/dds.cpp 2008-03-01 12:51:20.000000000 +0100
78+++ celestia-1.5.0/src/celengine/dds.cpp 2008-03-01 08:51:48.000000000 +0100
79@@ -15,6 +15,7 @@
80 #include <celengine/gl.h>
81 #include <celengine/glext.h>
82 #include <celengine/image.h>
83+#include <libintl.h>
84
85 using namespace std;
86
87diff -Naur celestia-1.5.0-upstream/src/celengine/dsodb.cpp celestia-1.5.0/src/celengine/dsodb.cpp
88--- celestia-1.5.0-upstream/src/celengine/dsodb.cpp 2008-03-01 12:51:20.000000000 +0100
89+++ celestia-1.5.0/src/celengine/dsodb.cpp 2008-03-01 08:51:48.000000000 +0100
90@@ -32,6 +32,7 @@
91 #include <celengine/galaxy.h>
92 #include <celengine/opencluster.h>
93 #include <celengine/nebula.h>
94+#include <libintl.h>
95
96 using namespace std;
97
98diff -Naur celestia-1.5.0-upstream/src/celengine/fragmentprog.cpp celestia-1.5.0/src/celengine/fragmentprog.cpp
99--- celestia-1.5.0-upstream/src/celengine/fragmentprog.cpp 2008-03-01 12:51:20.000000000 +0100
100+++ celestia-1.5.0/src/celengine/fragmentprog.cpp 2008-03-01 08:51:48.000000000 +0100
101@@ -13,6 +13,7 @@
102 #include "gl.h"
103 #include "glext.h"
104 #include "fragmentprog.h"
105+#include <libintl.h>
106
107 using namespace std;
108
109diff -Naur celestia-1.5.0-upstream/src/celengine/galaxy.cpp celestia-1.5.0/src/celengine/galaxy.cpp
110--- celestia-1.5.0-upstream/src/celengine/galaxy.cpp 2008-03-01 12:51:20.000000000 +0100
111+++ celestia-1.5.0/src/celengine/galaxy.cpp 2008-03-01 11:52:10.000000000 +0100
112@@ -23,6 +23,8 @@
113 #include "vecgl.h"
114 #include "render.h"
115 #include "texture.h"
116+#include <libintl.h>
117+#include <string.h>
118
119 using namespace std;
120
121diff -Naur celestia-1.5.0-upstream/src/celengine/glcontext.cpp celestia-1.5.0/src/celengine/glcontext.cpp
122--- celestia-1.5.0-upstream/src/celengine/glcontext.cpp 2008-03-01 12:51:20.000000000 +0100
123+++ celestia-1.5.0/src/celengine/glcontext.cpp 2008-03-01 08:51:48.000000000 +0100
124@@ -12,6 +12,7 @@
125 #include "gl.h"
126 #include "glext.h"
127 #include "glcontext.h"
128+#include <libintl.h>
129
130 using namespace std;
131
132diff -Naur celestia-1.5.0-upstream/src/celengine/glext.cpp celestia-1.5.0/src/celengine/glext.cpp
133--- celestia-1.5.0-upstream/src/celengine/glext.cpp 2008-03-01 12:51:20.000000000 +0100
134+++ celestia-1.5.0/src/celengine/glext.cpp 2008-03-01 08:52:56.000000000 +0100
135@@ -8,6 +8,7 @@
136 // of the License, or (at your option) any later version.
137
138 #include <string.h>
139+#include <cstring>
140 #include "gl.h"
141
142 #ifndef _WIN32
143@@ -19,6 +20,7 @@
144 #endif /* ! _WIN32 */
145
146 #include "glext.h"
147+#include <libintl.h>
148
149 // ARB_texture_compression
150 glx::PFNGLCOMPRESSEDTEXIMAGE3DARBPROC glx::glCompressedTexImage3DARB;
151diff -Naur celestia-1.5.0-upstream/src/celengine/image.cpp celestia-1.5.0/src/celengine/image.cpp
152--- celestia-1.5.0-upstream/src/celengine/image.cpp 2008-03-01 12:51:20.000000000 +0100
153+++ celestia-1.5.0/src/celengine/image.cpp 2008-03-01 08:51:48.000000000 +0100
154@@ -66,6 +66,7 @@
155 #include <iostream>
156 #include <algorithm>
157 #include <cmath>
158+#include <libintl.h>
159
160 using namespace std;
161
162diff -Naur celestia-1.5.0-upstream/src/celengine/location.cpp celestia-1.5.0/src/celengine/location.cpp
163--- celestia-1.5.0-upstream/src/celengine/location.cpp 2008-03-01 12:51:20.000000000 +0100
164+++ celestia-1.5.0/src/celengine/location.cpp 2008-03-01 09:34:18.000000000 +0100
165@@ -11,6 +11,7 @@
166 #include <celengine/location.h>
167 #include <celengine/body.h>
168 #include <celutil/util.h>
169+#include <libintl.h>
170
171 using namespace std;
172
173diff -Naur celestia-1.5.0-upstream/src/celengine/lodspheremesh.cpp celestia-1.5.0/src/celengine/lodspheremesh.cpp
174--- celestia-1.5.0-upstream/src/celengine/lodspheremesh.cpp 2008-03-01 12:51:20.000000000 +0100
175+++ celestia-1.5.0/src/celengine/lodspheremesh.cpp 2008-03-01 08:51:48.000000000 +0100
176@@ -17,6 +17,7 @@
177 #include "glext.h"
178 #include "vecgl.h"
179 #include "lodspheremesh.h"
180+#include <libintl.h>
181
182 using namespace std;
183
184diff -Naur celestia-1.5.0-upstream/src/celengine/marker.cpp celestia-1.5.0/src/celengine/marker.cpp
185--- celestia-1.5.0-upstream/src/celengine/marker.cpp 2008-03-01 12:51:20.000000000 +0100
186+++ celestia-1.5.0/src/celengine/marker.cpp 2008-03-01 08:51:48.000000000 +0100
187@@ -9,6 +9,7 @@
188
189 #include "marker.h"
190 #include "gl.h"
191+#include <libintl.h>
192
193
194 using namespace std;
195diff -Naur celestia-1.5.0-upstream/src/celengine/mesh.cpp celestia-1.5.0/src/celengine/mesh.cpp
196--- celestia-1.5.0-upstream/src/celengine/mesh.cpp 2008-03-01 12:51:20.000000000 +0100
197+++ celestia-1.5.0/src/celengine/mesh.cpp 2008-03-01 08:51:48.000000000 +0100
198@@ -14,6 +14,7 @@
199 #include <cassert>
200 #include <iostream>
201 #include <algorithm>
202+#include <libintl.h>
203
204 using namespace std;
205
206diff -Naur celestia-1.5.0-upstream/src/celengine/meshmanager.cpp celestia-1.5.0/src/celengine/meshmanager.cpp
207--- celestia-1.5.0-upstream/src/celengine/meshmanager.cpp 2008-03-01 12:51:20.000000000 +0100
208+++ celestia-1.5.0/src/celengine/meshmanager.cpp 2008-03-01 08:51:48.000000000 +0100
209@@ -26,6 +26,7 @@
210 #include "spheremesh.h"
211 #include "texmanager.h"
212 #include "meshmanager.h"
213+#include <libintl.h>
214
215 using namespace std;
216
217diff -Naur celestia-1.5.0-upstream/src/celengine/modelfile.cpp celestia-1.5.0/src/celengine/modelfile.cpp
218--- celestia-1.5.0-upstream/src/celengine/modelfile.cpp 2008-03-01 12:51:20.000000000 +0100
219+++ celestia-1.5.0/src/celengine/modelfile.cpp 2008-03-01 11:52:21.000000000 +0100
220@@ -15,6 +15,8 @@
221 #include <cassert>
222 #include <cmath>
223 #include <cstdio>
224+#include <libintl.h>
225+#include <string.h>
226
227 using namespace std;
228
229diff -Naur celestia-1.5.0-upstream/src/celengine/nebula.cpp celestia-1.5.0/src/celengine/nebula.cpp
230--- celestia-1.5.0-upstream/src/celengine/nebula.cpp 2008-03-01 12:51:20.000000000 +0100
231+++ celestia-1.5.0/src/celengine/nebula.cpp 2008-03-01 08:51:48.000000000 +0100
232@@ -21,6 +21,7 @@
233 #include "glext.h"
234 #include "vecgl.h"
235 #include "render.h"
236+#include <libintl.h>
237
238 using namespace std;
239
240diff -Naur celestia-1.5.0-upstream/src/celengine/opencluster.cpp celestia-1.5.0/src/celengine/opencluster.cpp
241--- celestia-1.5.0-upstream/src/celengine/opencluster.cpp 2008-03-01 12:51:20.000000000 +0100
242+++ celestia-1.5.0/src/celengine/opencluster.cpp 2008-03-01 08:51:48.000000000 +0100
243@@ -19,6 +19,7 @@
244 #include "gl.h"
245 #include "vecgl.h"
246 #include "render.h"
247+#include <libintl.h>
248
249 using namespace std;
250
251diff -Naur celestia-1.5.0-upstream/src/celengine/overlay.cpp celestia-1.5.0/src/celengine/overlay.cpp
252--- celestia-1.5.0-upstream/src/celengine/overlay.cpp 2008-03-01 12:51:20.000000000 +0100
253+++ celestia-1.5.0/src/celengine/overlay.cpp 2008-03-01 08:50:23.000000000 +0100
254@@ -9,6 +9,7 @@
255
256 #include <cstdarg>
257 #include <cstdio>
258+#include <cstring>
259 #include <celutil/utf8.h>
260 #include "gl.h"
261 #include "vecgl.h"
262diff -Naur celestia-1.5.0-upstream/src/celengine/parseobject.cpp celestia-1.5.0/src/celengine/parseobject.cpp
263--- celestia-1.5.0-upstream/src/celengine/parseobject.cpp 2008-03-01 12:51:20.000000000 +0100
264+++ celestia-1.5.0/src/celengine/parseobject.cpp 2008-03-01 08:51:48.000000000 +0100
265@@ -21,6 +21,7 @@
266 #include "trajmanager.h"
267 #include "rotationmanager.h"
268 #include "universe.h"
269+#include <libintl.h>
270
271 using namespace std;
272
273diff -Naur celestia-1.5.0-upstream/src/celengine/render.cpp celestia-1.5.0/src/celengine/render.cpp
274--- celestia-1.5.0-upstream/src/celengine/render.cpp 2008-03-01 12:51:20.000000000 +0100
275+++ celestia-1.5.0/src/celengine/render.cpp 2008-03-01 08:53:29.000000000 +0100
276@@ -11,6 +11,7 @@
277 #include <cstdio>
278 #include <cstring>
279 #include <cassert>
280+#include <libintl.h>
281
282 #ifndef _WIN32
283 #ifndef TARGET_OS_MAC
284diff -Naur celestia-1.5.0-upstream/src/celengine/rotationmanager.cpp celestia-1.5.0/src/celengine/rotationmanager.cpp
285--- celestia-1.5.0-upstream/src/celengine/rotationmanager.cpp 2008-03-01 12:51:20.000000000 +0100
286+++ celestia-1.5.0/src/celengine/rotationmanager.cpp 2008-03-01 08:51:48.000000000 +0100
287@@ -14,6 +14,7 @@
288 #include <celutil/debug.h>
289 #include "samporient.h"
290 #include "rotationmanager.h"
291+#include <libintl.h>
292
293 using namespace std;
294
295diff -Naur celestia-1.5.0-upstream/src/celengine/selection.cpp celestia-1.5.0/src/celengine/selection.cpp
296--- celestia-1.5.0-upstream/src/celengine/selection.cpp 2008-03-01 12:51:20.000000000 +0100
297+++ celestia-1.5.0/src/celengine/selection.cpp 2008-03-01 09:34:25.000000000 +0100
298@@ -8,6 +8,7 @@
299 // of the License, or (at your option) any later version.
300
301 #include <cstdio>
302+#include <libintl.h>
303 #include "astro.h"
304 #include "selection.h"
305
306diff -Naur celestia-1.5.0-upstream/src/celengine/shadermanager.cpp celestia-1.5.0/src/celengine/shadermanager.cpp
307--- celestia-1.5.0-upstream/src/celengine/shadermanager.cpp 2008-03-01 12:51:20.000000000 +0100
308+++ celestia-1.5.0/src/celengine/shadermanager.cpp 2008-03-01 08:51:48.000000000 +0100
309@@ -15,6 +15,7 @@
310 #include <iomanip>
311 #include <cstdio>
312 #include <cassert>
313+#include <libintl.h>
314
315 using namespace std;
316
317diff -Naur celestia-1.5.0-upstream/src/celengine/simulation.cpp celestia-1.5.0/src/celengine/simulation.cpp
318--- celestia-1.5.0-upstream/src/celengine/simulation.cpp 2008-03-01 12:51:20.000000000 +0100
319+++ celestia-1.5.0/src/celengine/simulation.cpp 2008-03-01 09:34:28.000000000 +0100
320@@ -11,6 +11,7 @@
321 // of the License, or (at your option) any later version.
322
323 #include <algorithm>
324+#include <libintl.h>
325 #include "simulation.h"
326
327 using namespace std;
328diff -Naur celestia-1.5.0-upstream/src/celengine/solarsys.cpp celestia-1.5.0/src/celengine/solarsys.cpp
329--- celestia-1.5.0-upstream/src/celengine/solarsys.cpp 2008-03-01 12:51:20.000000000 +0100
330+++ celestia-1.5.0/src/celengine/solarsys.cpp 2008-03-01 08:51:48.000000000 +0100
331@@ -30,6 +30,7 @@
332 #include "universe.h"
333 #include "multitexture.h"
334 #include "parseobject.h"
335+#include <libintl.h>
336
337 using namespace std;
338
339diff -Naur celestia-1.5.0-upstream/src/celengine/solarsysxml.cpp celestia-1.5.0/src/celengine/solarsysxml.cpp
340--- celestia-1.5.0-upstream/src/celengine/solarsysxml.cpp 2008-03-01 12:51:20.000000000 +0100
341+++ celestia-1.5.0/src/celengine/solarsysxml.cpp 2008-03-01 11:52:31.000000000 +0100
342@@ -8,6 +8,8 @@
343 // of the License, or (at your option) any later version.
344
345 #include <cassert>
346+#include <cstring>
347+#include <string.h>
348
349 #include <libxml/parser.h>
350 #include <libxml/parserInternals.h>
351@@ -20,6 +22,7 @@
352 #include "texmanager.h"
353 #include "meshmanager.h"
354 #include "solarsysxml.h"
355+#include <libintl.h>
356
357 using namespace std;
358
359diff -Naur celestia-1.5.0-upstream/src/celengine/spiceinterface.cpp celestia-1.5.0/src/celengine/spiceinterface.cpp
360--- celestia-1.5.0-upstream/src/celengine/spiceinterface.cpp 2008-03-01 12:51:20.000000000 +0100
361+++ celestia-1.5.0/src/celengine/spiceinterface.cpp 2008-03-01 08:51:48.000000000 +0100
362@@ -11,6 +11,7 @@
363
364 #include "SpiceUsr.h"
365 #include "spiceinterface.h"
366+#include <libintl.h>
367
368
369 bool
370diff -Naur celestia-1.5.0-upstream/src/celengine/spiceorbit.cpp celestia-1.5.0/src/celengine/spiceorbit.cpp
371--- celestia-1.5.0-upstream/src/celengine/spiceorbit.cpp 2008-03-01 12:51:20.000000000 +0100
372+++ celestia-1.5.0/src/celengine/spiceorbit.cpp 2008-03-01 08:51:48.000000000 +0100
373@@ -14,6 +14,7 @@
374 #include "SpiceUsr.h"
375 #include "astro.h"
376 #include "spiceorbit.h"
377+#include <libintl.h>
378
379 using namespace std;
380
381diff -Naur celestia-1.5.0-upstream/src/celengine/stardb.cpp celestia-1.5.0/src/celengine/stardb.cpp
382--- celestia-1.5.0-upstream/src/celengine/stardb.cpp 2008-03-01 12:51:20.000000000 +0100
383+++ celestia-1.5.0/src/celengine/stardb.cpp 2008-03-01 08:51:48.000000000 +0100
384@@ -10,6 +10,7 @@
385 #include <cmath>
386 #include <cstdlib>
387 #include <cstdio>
388+#include <cstring>
389 #include <cassert>
390 #include <algorithm>
391 #include <celmath/mathlib.h>
392@@ -24,6 +25,7 @@
393 #include "multitexture.h"
394 #include "meshmanager.h"
395 #include <celutil/debug.h>
396+#include <libintl.h>
397
398 using namespace std;
399
400diff -Naur celestia-1.5.0-upstream/src/celengine/texmanager.cpp celestia-1.5.0/src/celengine/texmanager.cpp
401--- celestia-1.5.0-upstream/src/celengine/texmanager.cpp 2008-03-01 12:51:20.000000000 +0100
402+++ celestia-1.5.0/src/celengine/texmanager.cpp 2008-03-01 08:51:48.000000000 +0100
403@@ -13,6 +13,7 @@
404 #include <fstream>
405 #include "multitexture.h"
406 #include "texmanager.h"
407+#include <libintl.h>
408
409 using namespace std;
410
411diff -Naur celestia-1.5.0-upstream/src/celengine/texture.cpp celestia-1.5.0/src/celengine/texture.cpp
412--- celestia-1.5.0-upstream/src/celengine/texture.cpp 2008-03-01 12:51:20.000000000 +0100
413+++ celestia-1.5.0/src/celengine/texture.cpp 2008-03-01 08:54:00.000000000 +0100
414@@ -28,6 +28,7 @@
415 #include <cstdlib>
416 #include <cstdio>
417 #include <cassert>
418+#include <libintl.h>
419
420 #ifndef _WIN32
421 #ifndef TARGET_OS_MAC
422diff -Naur celestia-1.5.0-upstream/src/celengine/tokenizer.cpp celestia-1.5.0/src/celengine/tokenizer.cpp
423--- celestia-1.5.0-upstream/src/celengine/tokenizer.cpp 2008-03-01 12:51:20.000000000 +0100
424+++ celestia-1.5.0/src/celengine/tokenizer.cpp 2008-03-01 08:51:48.000000000 +0100
425@@ -12,6 +12,7 @@
426 #include <iomanip>
427 #include <celutil/utf8.h>
428 #include "tokenizer.h"
429+#include <libintl.h>
430
431
432 static bool issep(char c)
433diff -Naur celestia-1.5.0-upstream/src/celengine/trajmanager.cpp celestia-1.5.0/src/celengine/trajmanager.cpp
434--- celestia-1.5.0-upstream/src/celengine/trajmanager.cpp 2008-03-01 12:51:20.000000000 +0100
435+++ celestia-1.5.0/src/celengine/trajmanager.cpp 2008-03-01 08:51:48.000000000 +0100
436@@ -15,6 +15,7 @@
437 #include <celutil/debug.h>
438 #include "samporbit.h"
439 #include "trajmanager.h"
440+#include <libintl.h>
441
442 using namespace std;
443
444diff -Naur celestia-1.5.0-upstream/src/celengine/universe.cpp celestia-1.5.0/src/celengine/universe.cpp
445--- celestia-1.5.0-upstream/src/celengine/universe.cpp 2008-03-01 12:51:20.000000000 +0100
446+++ celestia-1.5.0/src/celengine/universe.cpp 2008-03-01 09:34:33.000000000 +0100
447@@ -13,6 +13,7 @@
448 #include <celmath/intersect.h>
449 #include <celutil/utf8.h>
450 #include <cassert>
451+#include <libintl.h>
452 #include "astro.h"
453 #include "3dsmesh.h"
454 #include "meshmanager.h"
455diff -Naur celestia-1.5.0-upstream/src/celengine/vertexprog.cpp celestia-1.5.0/src/celengine/vertexprog.cpp
456--- celestia-1.5.0-upstream/src/celengine/vertexprog.cpp 2008-03-01 12:51:20.000000000 +0100
457+++ celestia-1.5.0/src/celengine/vertexprog.cpp 2008-03-01 08:51:48.000000000 +0100
458@@ -14,6 +14,7 @@
459 #include "gl.h"
460 #include "glext.h"
461 #include "vertexprog.h"
462+#include <libintl.h>
463
464 using namespace std;
465
466diff -Naur celestia-1.5.0-upstream/src/celengine/virtualtex.cpp celestia-1.5.0/src/celengine/virtualtex.cpp
467--- celestia-1.5.0-upstream/src/celengine/virtualtex.cpp 2008-03-01 12:51:20.000000000 +0100
468+++ celestia-1.5.0/src/celengine/virtualtex.cpp 2008-03-01 08:51:48.000000000 +0100
469@@ -19,6 +19,7 @@
470 #include "virtualtex.h"
471 #include "gl.h"
472 #include "parser.h"
473+#include <libintl.h>
474
475 using namespace std;
476
477diff -Naur celestia-1.5.0-upstream/src/celestia/celestiacore.cpp celestia-1.5.0/src/celestia/celestiacore.cpp
478--- celestia-1.5.0-upstream/src/celestia/celestiacore.cpp 2008-03-01 12:51:20.000000000 +0100
479+++ celestia-1.5.0/src/celestia/celestiacore.cpp 2008-03-01 08:54:18.000000000 +0100
480@@ -43,6 +43,7 @@
481 #include <celutil/debug.h>
482 #include <celutil/utf8.h>
483 #include "url.h"
484+#include <libintl.h>
485
486 #ifdef CELX
487 #include <celengine/scriptobject.h>
488diff -Naur celestia-1.5.0-upstream/src/celestia/celx.cpp celestia-1.5.0/src/celestia/celx.cpp
489--- celestia-1.5.0-upstream/src/celestia/celx.cpp 2008-03-01 12:51:20.000000000 +0100
490+++ celestia-1.5.0/src/celestia/celx.cpp 2008-03-01 11:52:38.000000000 +0100
491@@ -11,7 +11,9 @@
492
493 #include <cassert>
494 #include <cstring>
495+#include <string.h>
496 #include <cstdio>
497+#include <libintl.h>
498 #include <map>
499 #include <celengine/astro.h>
500 #include <celengine/celestia.h>
501diff -Naur celestia-1.5.0-upstream/src/celestia/configfile.cpp celestia-1.5.0/src/celestia/configfile.cpp
502--- celestia-1.5.0-upstream/src/celestia/configfile.cpp 2008-03-01 12:51:20.000000000 +0100
503+++ celestia-1.5.0/src/celestia/configfile.cpp 2008-03-01 08:51:48.000000000 +0100
504@@ -16,6 +16,7 @@
505 #include <celengine/celestia.h>
506 #include <celengine/texmanager.h>
507 #include "configfile.h"
508+#include <libintl.h>
509
510 using namespace std;
511
512diff -Naur celestia-1.5.0-upstream/src/celestia/destination.cpp celestia-1.5.0/src/celestia/destination.cpp
513--- celestia-1.5.0-upstream/src/celestia/destination.cpp 2008-03-01 12:51:20.000000000 +0100
514+++ celestia-1.5.0/src/celestia/destination.cpp 2008-03-01 08:51:48.000000000 +0100
515@@ -14,6 +14,7 @@
516 #include <celengine/astro.h>
517 #include <celengine/parser.h>
518 #include "destination.h"
519+#include <libintl.h>
520
521 using namespace std;
522
523diff -Naur celestia-1.5.0-upstream/src/celestia/eclipsefinder.cpp celestia-1.5.0/src/celestia/eclipsefinder.cpp
524--- celestia-1.5.0-upstream/src/celestia/eclipsefinder.cpp 2008-03-01 12:51:20.000000000 +0100
525+++ celestia-1.5.0/src/celestia/eclipsefinder.cpp 2008-03-01 09:14:53.000000000 +0100
526@@ -15,6 +15,7 @@
527 #include <algorithm>
528 #include <set>
529 #include <cassert>
530+#include <cstring>
531 #include "eclipsefinder.h"
532 #include "celmath/mathlib.h"
533 #include "celmath/ray.h"
534diff -Naur celestia-1.5.0-upstream/src/celestia/glutmain.cpp celestia-1.5.0/src/celestia/glutmain.cpp
535--- celestia-1.5.0-upstream/src/celestia/glutmain.cpp 2008-03-01 12:51:20.000000000 +0100
536+++ celestia-1.5.0/src/celestia/glutmain.cpp 2008-03-01 08:55:18.000000000 +0100
537@@ -15,6 +15,7 @@
538 #include <cstdlib>
539 #include <cctype>
540 #include <cstring>
541+#include <libintl.h>
542 #include <time.h>
543 #include <unistd.h>
544 #include <celengine/gl.h>
545diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/actions.cpp celestia-1.5.0/src/celestia/gtk/actions.cpp
546--- celestia-1.5.0-upstream/src/celestia/gtk/actions.cpp 2008-03-01 12:51:20.000000000 +0100
547+++ celestia-1.5.0/src/celestia/gtk/actions.cpp 2008-03-01 08:55:33.000000000 +0100
548@@ -15,6 +15,7 @@
549 #endif /* HAVE_CONFIG_H */
550
551 #include <cstring>
552+#include <libintl.h>
553 #include <fstream>
554 #include <gtk/gtk.h>
555
556diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/common.cpp celestia-1.5.0/src/celestia/gtk/common.cpp
557--- celestia-1.5.0-upstream/src/celestia/gtk/common.cpp 2008-03-01 12:51:20.000000000 +0100
558+++ celestia-1.5.0/src/celestia/gtk/common.cpp 2008-03-01 08:51:48.000000000 +0100
559@@ -20,6 +20,7 @@
560 #include <celestia/celestiacore.h>
561
562 #include "common.h"
563+#include <libintl.h>
564
565
566 /* Returns the offset of the timezone at date */
567diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-eclipse.cpp celestia-1.5.0/src/celestia/gtk/dialog-eclipse.cpp
568--- celestia-1.5.0-upstream/src/celestia/gtk/dialog-eclipse.cpp 2008-03-01 12:51:20.000000000 +0100
569+++ celestia-1.5.0/src/celestia/gtk/dialog-eclipse.cpp 2008-03-01 08:51:48.000000000 +0100
570@@ -18,6 +18,7 @@
571
572 #include "dialog-eclipse.h"
573 #include "common.h"
574+#include <libintl.h>
575
576
577 /* Definitions: Callbacks */
578diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-goto.cpp celestia-1.5.0/src/celestia/gtk/dialog-goto.cpp
579--- celestia-1.5.0-upstream/src/celestia/gtk/dialog-goto.cpp 2008-03-01 12:51:20.000000000 +0100
580+++ celestia-1.5.0/src/celestia/gtk/dialog-goto.cpp 2008-03-01 08:51:49.000000000 +0100
581@@ -18,6 +18,7 @@
582
583 #include "dialog-goto.h"
584 #include "common.h"
585+#include <libintl.h>
586
587
588 /* Declarations: Callbacks */
589diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-options.cpp celestia-1.5.0/src/celestia/gtk/dialog-options.cpp
590--- celestia-1.5.0-upstream/src/celestia/gtk/dialog-options.cpp 2008-03-01 12:51:20.000000000 +0100
591+++ celestia-1.5.0/src/celestia/gtk/dialog-options.cpp 2008-03-01 08:51:49.000000000 +0100
592@@ -17,6 +17,7 @@
593 #include "dialog-options.h"
594 #include "common.h"
595 #include "ui.h"
596+#include <libintl.h>
597
598
599 /* Definitions: Callbacks */
600diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-solar.cpp celestia-1.5.0/src/celestia/gtk/dialog-solar.cpp
601--- celestia-1.5.0-upstream/src/celestia/gtk/dialog-solar.cpp 2008-03-01 12:51:20.000000000 +0100
602+++ celestia-1.5.0/src/celestia/gtk/dialog-solar.cpp 2008-03-01 08:51:49.000000000 +0100
603@@ -22,6 +22,7 @@
604 #include "dialog-solar.h"
605 #include "actions.h"
606 #include "common.h"
607+#include <libintl.h>
608
609
610 /* Declarations: Callbacks */
611diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-star.cpp celestia-1.5.0/src/celestia/gtk/dialog-star.cpp
612--- celestia-1.5.0-upstream/src/celestia/gtk/dialog-star.cpp 2008-03-01 12:51:20.000000000 +0100
613+++ celestia-1.5.0/src/celestia/gtk/dialog-star.cpp 2008-03-01 08:51:49.000000000 +0100
614@@ -25,6 +25,7 @@
615 #include "dialog-star.h"
616 #include "actions.h"
617 #include "common.h"
618+#include <libintl.h>
619
620
621 /* Declarations: Callbacks */
622diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-time.cpp celestia-1.5.0/src/celestia/gtk/dialog-time.cpp
623--- celestia-1.5.0-upstream/src/celestia/gtk/dialog-time.cpp 2008-03-01 12:51:20.000000000 +0100
624+++ celestia-1.5.0/src/celestia/gtk/dialog-time.cpp 2008-03-01 08:51:49.000000000 +0100
625@@ -18,6 +18,7 @@
626
627 #include "dialog-time.h"
628 #include "common.h"
629+#include <libintl.h>
630
631
632 /* Declarations: Callbacks */
633diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-tour.cpp celestia-1.5.0/src/celestia/gtk/dialog-tour.cpp
634--- celestia-1.5.0-upstream/src/celestia/gtk/dialog-tour.cpp 2008-03-01 12:51:20.000000000 +0100
635+++ celestia-1.5.0/src/celestia/gtk/dialog-tour.cpp 2008-03-01 08:51:49.000000000 +0100
636@@ -18,6 +18,7 @@
637
638 #include "dialog-tour.h"
639 #include "common.h"
640+#include <libintl.h>
641
642
643 /* Declarations: Callbacks */
644diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/main.cpp celestia-1.5.0/src/celestia/gtk/main.cpp
645--- celestia-1.5.0-upstream/src/celestia/gtk/main.cpp 2008-03-01 12:51:20.000000000 +0100
646+++ celestia-1.5.0/src/celestia/gtk/main.cpp 2008-03-01 08:56:03.000000000 +0100
647@@ -19,6 +19,7 @@
648 #include <cstdlib>
649 #include <cctype>
650 #include <cstring>
651+#include <libintl.h>
652 #include <time.h>
653
654 #ifdef WIN32
655diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/menu-context.cpp celestia-1.5.0/src/celestia/gtk/menu-context.cpp
656--- celestia-1.5.0-upstream/src/celestia/gtk/menu-context.cpp 2008-03-01 12:51:20.000000000 +0100
657+++ celestia-1.5.0/src/celestia/gtk/menu-context.cpp 2008-03-01 08:51:49.000000000 +0100
658@@ -20,6 +20,7 @@
659 #include "menu-context.h"
660 #include "actions.h"
661 #include "common.h"
662+#include <libintl.h>
663
664
665 /* Definitions: Callbacks */
666diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/settings-file.cpp celestia-1.5.0/src/celestia/gtk/settings-file.cpp
667--- celestia-1.5.0-upstream/src/celestia/gtk/settings-file.cpp 2008-03-01 12:51:20.000000000 +0100
668+++ celestia-1.5.0/src/celestia/gtk/settings-file.cpp 2008-03-01 09:34:40.000000000 +0100
669@@ -11,6 +11,7 @@
670 */
671
672 #include <gtk/gtk.h>
673+#include <libintl.h>
674
675 #include <celengine/body.h>
676 #include <celengine/galaxy.h>
677diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/settings-gconf.cpp celestia-1.5.0/src/celestia/gtk/settings-gconf.cpp
678--- celestia-1.5.0-upstream/src/celestia/gtk/settings-gconf.cpp 2008-03-01 12:51:20.000000000 +0100
679+++ celestia-1.5.0/src/celestia/gtk/settings-gconf.cpp 2008-03-01 09:34:44.000000000 +0100
680@@ -12,6 +12,7 @@
681
682 #include <gtk/gtk.h>
683 #include <gconf/gconf-client.h>
684+#include <libintl.h>
685
686 #include <celengine/body.h>
687 #include <celengine/galaxy.h>
688diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/splash.cpp celestia-1.5.0/src/celestia/gtk/splash.cpp
689--- celestia-1.5.0-upstream/src/celestia/gtk/splash.cpp 2008-03-01 12:51:20.000000000 +0100
690+++ celestia-1.5.0/src/celestia/gtk/splash.cpp 2008-03-01 08:51:49.000000000 +0100
691@@ -22,6 +22,7 @@
692
693 #include "splash.h"
694 #include "common.h"
695+#include <libintl.h>
696
697
698 /* Declarations */
699diff -Naur celestia-1.5.0-upstream/src/celestia/kde/celestialbrowser.cpp celestia-1.5.0/src/celestia/kde/celestialbrowser.cpp
700--- celestia-1.5.0-upstream/src/celestia/kde/celestialbrowser.cpp 2008-03-01 12:51:20.000000000 +0100
701+++ celestia-1.5.0/src/celestia/kde/celestialbrowser.cpp 2008-03-01 08:51:49.000000000 +0100
702@@ -16,6 +16,7 @@
703 #include "cellistviewitem.h"
704 #include "selectionpopup.h"
705 #include "celutil/utf8.h"
706+#include <libintl.h>
707
708 /*
709 * Constructs a CelestialBrowser which is a child of 'parent', with the
710diff -Naur celestia-1.5.0-upstream/src/celestia/kde/celsplashscreen.cpp celestia-1.5.0/src/celestia/kde/celsplashscreen.cpp
711--- celestia-1.5.0-upstream/src/celestia/kde/celsplashscreen.cpp 2008-03-01 12:51:20.000000000 +0100
712+++ celestia-1.5.0/src/celestia/kde/celsplashscreen.cpp 2008-03-01 08:51:49.000000000 +0100
713@@ -22,6 +22,7 @@
714 #include <kglobalsettings.h>
715 #include <celsplashscreen.h>
716 #include <X11/Xlib.h>
717+#include <libintl.h>
718
719 CelSplashScreen::CelSplashScreen(const QString& filename, QWidget* _parent):
720 QWidget(0, 0, WStyle_Customize | WX11BypassWM),
721diff -Naur celestia-1.5.0-upstream/src/celestia/kde/eclipsefinderdlg.cpp celestia-1.5.0/src/celestia/kde/eclipsefinderdlg.cpp
722--- celestia-1.5.0-upstream/src/celestia/kde/eclipsefinderdlg.cpp 2008-03-01 12:51:20.000000000 +0100
723+++ celestia-1.5.0/src/celestia/kde/eclipsefinderdlg.cpp 2008-03-01 08:51:49.000000000 +0100
724@@ -11,6 +11,7 @@
725 #include "celestiacore.h"
726 #include "celengine/astro.h"
727 #include "eclipsefinder.h"
728+#include <libintl.h>
729
730 /*
731 * Constructs a EclipseFinder which is a child of 'parent', with the
732diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmanager.cpp celestia-1.5.0/src/celestia/kde/kcelbookmarkmanager.cpp
733--- celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmanager.cpp 2008-03-01 12:51:20.000000000 +0100
734+++ celestia-1.5.0/src/celestia/kde/kcelbookmarkmanager.cpp 2008-03-01 08:51:49.000000000 +0100
735@@ -19,6 +19,7 @@
736 #include <qdir.h>
737 #include <kstandarddirs.h>
738 #include "kcelbookmarkmanager.h"
739+#include <libintl.h>
740
741 KBookmarkManager* KCelBookmarkManager::self() {
742 if ( !s_bookmarkManager )
743diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmenu.cpp celestia-1.5.0/src/celestia/kde/kcelbookmarkmenu.cpp
744--- celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmenu.cpp 2008-03-01 12:51:20.000000000 +0100
745+++ celestia-1.5.0/src/celestia/kde/kcelbookmarkmenu.cpp 2008-03-01 08:51:49.000000000 +0100
746@@ -45,6 +45,7 @@
747 #include <kpopupmenu.h>
748 #include <kstdaccel.h>
749 #include <kstdaction.h>
750+#include <libintl.h>
751
752 template class QPtrList<KCelBookmarkMenu>;
753
754diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdeapp.cpp celestia-1.5.0/src/celestia/kde/kdeapp.cpp
755--- celestia-1.5.0-upstream/src/celestia/kde/kdeapp.cpp 2008-03-01 12:51:20.000000000 +0100
756+++ celestia-1.5.0/src/celestia/kde/kdeapp.cpp 2008-03-01 08:51:49.000000000 +0100
757@@ -87,6 +87,7 @@
758 #endif
759
760 #include "celengine/glext.h"
761+#include <libintl.h>
762
763 #define MENUMAXSIZE 100
764
765diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdeglwidget.cpp celestia-1.5.0/src/celestia/kde/kdeglwidget.cpp
766--- celestia-1.5.0-upstream/src/celestia/kde/kdeglwidget.cpp 2008-03-01 12:51:20.000000000 +0100
767+++ celestia-1.5.0/src/celestia/kde/kdeglwidget.cpp 2008-03-01 08:51:49.000000000 +0100
768@@ -48,6 +48,7 @@
769
770 #include <math.h>
771 #include <vector>
772+#include <libintl.h>
773
774 KdeGlWidget::KdeGlWidget( QWidget* parent, const char* name, CelestiaCore* core)
775 : QGLWidget( parent, name )
776diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdemain.cpp celestia-1.5.0/src/celestia/kde/kdemain.cpp
777--- celestia-1.5.0-upstream/src/celestia/kde/kdemain.cpp 2008-03-01 12:51:20.000000000 +0100
778+++ celestia-1.5.0/src/celestia/kde/kdemain.cpp 2008-03-01 08:51:49.000000000 +0100
779@@ -20,6 +20,7 @@
780 #include <klocale.h>
781
782 #include "kdeuniquecelestia.h"
783+#include <libintl.h>
784
785 static const char *description =
786 I18N_NOOP("Celestia");
787diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdepreferencesdialog.cpp celestia-1.5.0/src/celestia/kde/kdepreferencesdialog.cpp
788--- celestia-1.5.0-upstream/src/celestia/kde/kdepreferencesdialog.cpp 2008-03-01 12:51:20.000000000 +0100
789+++ celestia-1.5.0/src/celestia/kde/kdepreferencesdialog.cpp 2008-03-01 08:51:49.000000000 +0100
790@@ -40,6 +40,7 @@
791 #include "celengine/render.h"
792 #include "celengine/glcontext.h"
793 #include "celengine/astro.h"
794+#include <libintl.h>
795
796 static uint32 FilterOtherLocations = ~(Location::City |
797 Location::Observatory |
798diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdeuniquecelestia.cpp celestia-1.5.0/src/celestia/kde/kdeuniquecelestia.cpp
799--- celestia-1.5.0-upstream/src/celestia/kde/kdeuniquecelestia.cpp 2008-03-01 12:51:20.000000000 +0100
800+++ celestia-1.5.0/src/celestia/kde/kdeuniquecelestia.cpp 2008-03-01 08:51:49.000000000 +0100
801@@ -21,6 +21,7 @@
802 #include <string>
803 #include <vector>
804 #include <klocale.h>
805+#include <libintl.h>
806
807 KdeUniqueCelestia::KdeUniqueCelestia() {
808
809diff -Naur celestia-1.5.0-upstream/src/celestia/kde/selectionpopup.cpp celestia-1.5.0/src/celestia/kde/selectionpopup.cpp
810--- celestia-1.5.0-upstream/src/celestia/kde/selectionpopup.cpp 2008-03-01 12:51:20.000000000 +0100
811+++ celestia-1.5.0/src/celestia/kde/selectionpopup.cpp 2008-03-01 08:51:49.000000000 +0100
812@@ -29,6 +29,7 @@
813 #include <krun.h>
814
815 #include "celutil/utf8.h"
816+#include <libintl.h>
817
818 SelectionPopup::SelectionPopup(QWidget* parent, CelestiaCore* _appCore, Selection _sel):
819 KPopupMenu(parent),
820diff -Naur celestia-1.5.0-upstream/src/celestia/kde/videocapturedlg.cpp celestia-1.5.0/src/celestia/kde/videocapturedlg.cpp
821--- celestia-1.5.0-upstream/src/celestia/kde/videocapturedlg.cpp 2008-03-01 12:51:20.000000000 +0100
822+++ celestia-1.5.0/src/celestia/kde/videocapturedlg.cpp 2008-03-01 08:51:49.000000000 +0100
823@@ -36,6 +36,7 @@
824 #include <kstatusbar.h>
825 #include <kapp.h>
826 #include "kdeapp.h"
827+#include <libintl.h>
828
829 VideoCaptureDlg::VideoCaptureDlg(QWidget* p, const QString &dir):
830 accepted(false)
831diff -Naur celestia-1.5.0-upstream/src/celestia/oggtheoracapture.cpp celestia-1.5.0/src/celestia/oggtheoracapture.cpp
832--- celestia-1.5.0-upstream/src/celestia/oggtheoracapture.cpp 2008-03-01 12:51:20.000000000 +0100
833+++ celestia-1.5.0/src/celestia/oggtheoracapture.cpp 2008-03-01 09:15:02.000000000 +0100
b586878e 834@@ -66,11 +66,14 @@
14640810
KK		 835 #include <celutil/util.h>
836 #include "../celengine/gl.h"
837 #include <string>
838+#include <cstring>
b586878e 839+#include <ctime>
14640810
KK		 840 #include "theora/theora.h"
841
842 using namespace std;
843
844 #include "oggtheoracapture.h"
845+#include <libintl.h>
846
847 // {"video-rate-target",required_argument,NULL,'V'},
848 // {"video-quality",required_argument,NULL,'v'},
849diff -Naur celestia-1.5.0-upstream/src/celestia/scriptmenu.cpp celestia-1.5.0/src/celestia/scriptmenu.cpp
850--- celestia-1.5.0-upstream/src/celestia/scriptmenu.cpp 2008-03-01 12:51:20.000000000 +0100
851+++ celestia-1.5.0/src/celestia/scriptmenu.cpp 2008-03-01 08:51:49.000000000 +0100
852@@ -13,6 +13,7 @@
853 #include "celutil/directory.h"
854 #include "celutil/filetype.h"
855 #include <fstream>
856+#include <libintl.h>
857
858 using namespace std;
859
860diff -Naur celestia-1.5.0-upstream/src/celestia/url.cpp celestia-1.5.0/src/celestia/url.cpp
861--- celestia-1.5.0-upstream/src/celestia/url.cpp 2008-03-01 12:51:20.000000000 +0100
862+++ celestia-1.5.0/src/celestia/url.cpp 2008-03-01 11:52:48.000000000 +0100
863@@ -16,10 +16,12 @@
864 ***************************************************************************/
865
866 #include <string>
867+#include <string.h>
868 #include <stdio.h>
869 #include "celestiacore.h"
870 #include "celengine/astro.h"
871 #include "url.h"
872+#include <libintl.h>
873
874 static const unsigned int CurrentCelestiaURLVersion = 2;
875
876diff -Naur celestia-1.5.0-upstream/src/celestia/wglext.cpp celestia-1.5.0/src/celestia/wglext.cpp
877--- celestia-1.5.0-upstream/src/celestia/wglext.cpp 2008-03-01 12:51:20.000000000 +0100
878+++ celestia-1.5.0/src/celestia/wglext.cpp 2008-03-01 11:52:52.000000000 +0100
879@@ -14,7 +14,10 @@
880 #include "wglext.h"
881 #include <windows.h>
882 #include <cstdio>
883+#include <cstring>
884+#include <string.h>
885 #include <vector>
886+#include <libintl.h>
887
888 using namespace std;
889
890diff -Naur celestia-1.5.0-upstream/src/celestia/winbookmarks.cpp celestia-1.5.0/src/celestia/winbookmarks.cpp
891--- celestia-1.5.0-upstream/src/celestia/winbookmarks.cpp 2008-03-01 12:51:20.000000000 +0100
892+++ celestia-1.5.0/src/celestia/winbookmarks.cpp 2008-03-01 11:52:58.000000000 +0100
893@@ -13,6 +13,7 @@
894 #include "res/resource.h"
895 #include <celutil/winutil.h>
896 #include <iostream>
897+#include <string.h>
898
899 using namespace std;
900
901diff -Naur celestia-1.5.0-upstream/src/celestia/windatepicker.cpp celestia-1.5.0/src/celestia/windatepicker.cpp
902--- celestia-1.5.0-upstream/src/celestia/windatepicker.cpp 2008-03-01 12:51:20.000000000 +0100
903+++ celestia-1.5.0/src/celestia/windatepicker.cpp 2008-03-01 08:51:49.000000000 +0100
904@@ -11,10 +11,12 @@
905
906 #include <windows.h>
907 #include <commctrl.h>
908+#include <cstring>
909 #include "celutil/basictypes.h"
910 #include "celengine/astro.h"
911 #include "celutil/util.h"
912 #include "celutil/winutil.h"
913+#include <libintl.h>
914
915
916 // DatePicker is a Win32 control for setting the date. It replaces the
917diff -Naur celestia-1.5.0-upstream/src/celestia/wineclipses.cpp celestia-1.5.0/src/celestia/wineclipses.cpp
918--- celestia-1.5.0-upstream/src/celestia/wineclipses.cpp 2008-03-01 12:51:20.000000000 +0100
919+++ celestia-1.5.0/src/celestia/wineclipses.cpp 2008-03-01 11:53:02.000000000 +0100
920@@ -10,6 +10,7 @@
921
922 #include <string>
923 #include <sstream>
924+#include <string.h>
925 #include <algorithm>
926 #include <set>
927 #include <cassert>
928@@ -23,6 +24,7 @@
929 #include "celmath/distance.h"
930 #include "celutil/util.h"
931 #include "celutil/winutil.h"
932+#include <libintl.h>
933
934 using namespace std;
935
936diff -Naur celestia-1.5.0-upstream/src/celestia/winhyperlinks.cpp celestia-1.5.0/src/celestia/winhyperlinks.cpp
937--- celestia-1.5.0-upstream/src/celestia/winhyperlinks.cpp 2008-03-01 12:51:20.000000000 +0100
938+++ celestia-1.5.0/src/celestia/winhyperlinks.cpp 2008-03-01 08:50:24.000000000 +0100
939@@ -9,6 +9,7 @@
940 // as published by the Free Software Foundation; either version 2
941 // of the License, or (at your option) any later version.
942
943+#include <cstring>
944 #include "winhyperlinks.h"
945 #include "res/resource.h"
946
947diff -Naur celestia-1.5.0-upstream/src/celestia/winmain.cpp celestia-1.5.0/src/celestia/winmain.cpp
948--- celestia-1.5.0-upstream/src/celestia/winmain.cpp 2008-03-01 12:51:20.000000000 +0100
949+++ celestia-1.5.0/src/celestia/winmain.cpp 2008-03-01 11:53:07.000000000 +0100
950@@ -23,6 +23,7 @@
951 #include <windows.h>
952 #include <commctrl.h>
953 #include <mmsystem.h>
954+#include <string.h>
955
956 #include <celmath/vecmath.h>
957 #include <celmath/quaternion.h>
958@@ -59,6 +60,7 @@
959 #include "wglext.h"
960
961 #include <locale.h>
962+#include <libintl.h>
963
964 using namespace std;
965
966diff -Naur celestia-1.5.0-upstream/src/celestia/winsplash.cpp celestia-1.5.0/src/celestia/winsplash.cpp
967--- celestia-1.5.0-upstream/src/celestia/winsplash.cpp 2008-03-01 12:51:20.000000000 +0100
968+++ celestia-1.5.0/src/celestia/winsplash.cpp 2008-03-01 08:51:49.000000000 +0100
969@@ -15,8 +15,9 @@
970 #include <commctrl.h>
971 #include "res/resource.h"
972 #include "celutil/util.h"
973 #include <iostream>
974+#include <libintl.h>
975 #include <locale.h>
976
977 using namespace std;
978
979diff -Naur celestia-1.5.0-upstream/src/celestia/winstarbrowser.cpp celestia-1.5.0/src/celestia/winstarbrowser.cpp
980--- celestia-1.5.0-upstream/src/celestia/winstarbrowser.cpp 2008-03-01 12:51:20.000000000 +0100
981+++ celestia-1.5.0/src/celestia/winstarbrowser.cpp 2008-03-01 11:53:13.000000000 +0100
982@@ -15,10 +15,12 @@
983 #include <windows.h>
984 #include <commctrl.h>
985 #include <cstring>
986+#include <string.h>
987 #include "winstarbrowser.h"
988 #include "celutil/winutil.h"
989
990 #include "res/resource.h"
991+#include <libintl.h>
992
993 extern void SetMouseCursor(LPCTSTR lpCursor);
994
995diff -Naur celestia-1.5.0-upstream/src/celestia/wintime.cpp celestia-1.5.0/src/celestia/wintime.cpp
996--- celestia-1.5.0-upstream/src/celestia/wintime.cpp 2008-03-01 12:51:20.000000000 +0100
997+++ celestia-1.5.0/src/celestia/wintime.cpp 2008-03-01 08:51:49.000000000 +0100
998@@ -18,6 +18,7 @@
999 #include <celengine/astro.h>
1000 #include "celutil/util.h"
1001 #include "celutil/winutil.h"
1002+#include <libintl.h>
1003
1004
1005
1006diff -Naur celestia-1.5.0-upstream/src/celmath/quaternion.h celestia-1.5.0/src/celmath/quaternion.h
1007--- celestia-1.5.0-upstream/src/celmath/quaternion.h 2008-03-01 12:51:20.000000000 +0100
1008+++ celestia-1.5.0/src/celmath/quaternion.h 2008-03-01 12:30:07.000000000 +0100
1009@@ -16,7 +16,6 @@
1010 #include <celmath/mathlib.h>
1011 #include <celmath/vecmath.h>
1012
1013-
1014 template<class T> class Quaternion
1015 {
1016 public:
1017diff -Naur celestia-1.5.0-upstream/src/celutil/bigfix.cpp celestia-1.5.0/src/celutil/bigfix.cpp
1018--- celestia-1.5.0-upstream/src/celutil/bigfix.cpp 2008-03-01 12:51:20.000000000 +0100
1019+++ celestia-1.5.0/src/celutil/bigfix.cpp 2008-03-01 08:51:49.000000000 +0100
1020@@ -10,6 +10,7 @@
1021 #include <math.h>
1022 #include <stdio.h>
1023 #include "bigfix.h"
1024+#include <libintl.h>
1025
1026
1027 /*** Constructors ***/
1028diff -Naur celestia-1.5.0-upstream/src/celutil/color.cpp celestia-1.5.0/src/celutil/color.cpp
1029--- celestia-1.5.0-upstream/src/celutil/color.cpp 2008-03-01 12:51:20.000000000 +0100
1030+++ celestia-1.5.0/src/celutil/color.cpp 2008-03-01 11:53:16.000000000 +0100
1031@@ -9,6 +9,7 @@
1032
1033 #include <cstdio>
1034 #include <cstring>
1035+#include <string.h>
1036 #include <cctype>
1037 #include "color.h"
1038
1039diff -Naur celestia-1.5.0-upstream/src/celutil/directory.cpp celestia-1.5.0/src/celutil/directory.cpp
1040--- celestia-1.5.0-upstream/src/celutil/directory.cpp 2008-03-01 12:51:20.000000000 +0100
1041+++ celestia-1.5.0/src/celutil/directory.cpp 2008-03-01 08:51:49.000000000 +0100
1042@@ -9,6 +9,7 @@
1043
1044 #include <iostream>
1045 #include "directory.h"
1046+#include <libintl.h>
1047
1048 using namespace std;
1049
1050diff -Naur celestia-1.5.0-upstream/src/celutil/filetype.cpp celestia-1.5.0/src/celutil/filetype.cpp
1051--- celestia-1.5.0-upstream/src/celutil/filetype.cpp 2008-03-01 12:51:20.000000000 +0100
1052+++ celestia-1.5.0/src/celutil/filetype.cpp 2008-03-01 08:51:49.000000000 +0100
1053@@ -11,6 +11,7 @@
1054 #include <cstdlib>
1055 #include "util.h"
1056 #include "filetype.h"
1057+#include <libintl.h>
1058
1059 using namespace std;
1060
1061diff -Naur celestia-1.5.0-upstream/src/celutil/formatnum.cpp celestia-1.5.0/src/celutil/formatnum.cpp
1062--- celestia-1.5.0-upstream/src/celutil/formatnum.cpp 2008-03-01 12:51:20.000000000 +0100
1063+++ celestia-1.5.0/src/celutil/formatnum.cpp 2008-03-01 08:50:23.000000000 +0100
1064@@ -10,6 +10,8 @@
1065 #include <cmath>
1066 #include <cstdio>
1067 #include <string>
1068+#include <cstring>
1069+#include <limits.h>
1070 #include "formatnum.h"
1071
1072 // HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf
1073diff -Naur celestia-1.5.0-upstream/src/celutil/utf8.cpp celestia-1.5.0/src/celutil/utf8.cpp
1074--- celestia-1.5.0-upstream/src/celutil/utf8.cpp 2008-03-01 12:51:20.000000000 +0100
1075+++ celestia-1.5.0/src/celutil/utf8.cpp 2008-03-01 08:51:49.000000000 +0100
1076@@ -9,7 +9,9 @@
1077
1078 #include "utf8.h"
1079 #include <cctype>
1080+#include <cstring>
1081 #include "util.h"
1082+#include <libintl.h>
1083
1084 unsigned int WGL4_Normalization_00[256] = {
1085 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
1086diff -Naur celestia-1.5.0-upstream/src/celutil/util.cpp celestia-1.5.0/src/celutil/util.cpp
1087--- celestia-1.5.0-upstream/src/celutil/util.cpp 2008-03-01 12:51:20.000000000 +0100
1088+++ celestia-1.5.0/src/celutil/util.cpp 2008-03-01 08:51:49.000000000 +0100
1089@@ -12,6 +12,7 @@
1090 #include "util.h"
1091 #include <sys/types.h>
1092 #include <sys/stat.h>
1093+#include <libintl.h>
1094
1095 using namespace std;
1096
1097diff -Naur celestia-1.5.0-upstream/src/celutil/util.h celestia-1.5.0/src/celutil/util.h
1098--- celestia-1.5.0-upstream/src/celutil/util.h 2008-03-01 12:51:20.000000000 +0100
1099+++ celestia-1.5.0/src/celutil/util.h 2008-03-01 11:49:36.000000000 +0100
1100@@ -22,11 +22,11 @@
1101 switch(0){case 0: case pred:;}
1102
1103 #ifndef min
1104-#define min(a, b) ((a) < (b) ? (a) : (b))
1105+template <typename T1, typename T2> bool min(T1 a, T2 b){ return a<(T1)b; }
1106 #endif
1107
1108 #ifndef max
1109-#define max(a, b) ((a) < (b) ? (b) : (a))
1110+template <typename T1, typename T2> bool max(T1 a, T2 b){ return a<(T1)b; }
1111 #endif
1112
1113 #ifdef _WIN32
1114diff -Naur celestia-1.5.0-upstream/src/celutil/windirectory.cpp celestia-1.5.0/src/celutil/windirectory.cpp
1115--- celestia-1.5.0-upstream/src/celutil/windirectory.cpp 2008-03-01 12:51:20.000000000 +0100
1116+++ celestia-1.5.0/src/celutil/windirectory.cpp 2008-03-01 08:51:49.000000000 +0100
1117@@ -10,6 +10,7 @@
1118 #include <iostream>
1119 #include <windows.h>
1120 #include "directory.h"
1121+#include <libintl.h>
1122
1123 using namespace std;
1124
1125diff -Naur celestia-1.5.0-upstream/src/packdb.cpp celestia-1.5.0/src/packdb.cpp
1126--- celestia-1.5.0-upstream/src/packdb.cpp 2008-03-01 12:51:20.000000000 +0100
1127+++ celestia-1.5.0/src/packdb.cpp 2008-03-01 08:51:49.000000000 +0100
1128@@ -10,6 +10,7 @@
1129 #include <stdlib.h>
1130 #include <stdio.h>
1131 #include <string.h>
1132+#include <libintl.h>
1133
1134 #define SPECTRAL_O 0
1135 #define SPECTRAL_B 1
1136diff -Naur celestia-1.5.0-upstream/src/tools/atmosphere/scattersim.cpp celestia-1.5.0/src/tools/atmosphere/scattersim.cpp
1137--- celestia-1.5.0-upstream/src/tools/atmosphere/scattersim.cpp 2008-03-01 12:51:20.000000000 +0100
1138+++ celestia-1.5.0/src/tools/atmosphere/scattersim.cpp 2008-03-01 11:53:23.000000000 +0100
1139@@ -11,7 +11,9 @@
1140 #include <iostream>
1141 #include <fstream>
1142 #include <string>
1143+#include <string.h>
1144 #include <cstdlib>
1145+#include <libintl.h>
1146 #include <cmath>
1147 #include <algorithm>
1148 #include <map>
1149diff -Naur celestia-1.5.0-upstream/src/tools/buildstardb.cpp celestia-1.5.0/src/tools/buildstardb.cpp
1150--- celestia-1.5.0-upstream/src/tools/buildstardb.cpp 2008-03-01 12:51:20.000000000 +0100
1151+++ celestia-1.5.0/src/tools/buildstardb.cpp 2008-03-01 08:51:49.000000000 +0100
1152@@ -16,6 +16,7 @@
1153 #include <cstdio>
1154 #include <assert.h>
1155 #include "stardb.h"
1156+#include <libintl.h>
1157
1158 using namespace std;
1159
1160diff -Naur celestia-1.5.0-upstream/src/tools/cmod/cmodfix.cpp celestia-1.5.0/src/tools/cmod/cmodfix.cpp
1161--- celestia-1.5.0-upstream/src/tools/cmod/cmodfix.cpp 2008-03-01 12:51:20.000000000 +0100
1162+++ celestia-1.5.0/src/tools/cmod/cmodfix.cpp 2008-03-01 11:53:27.000000000 +0100
1163@@ -18,6 +18,7 @@
1164 #include <cassert>
1165 #include <cmath>
1166 #include <cstdio>
1167+#include <string.h>
1168 #include <algorithm>
1169 #include <vector>
1170 #ifdef TRISTRIP
1171diff -Naur celestia-1.5.0-upstream/src/tools/cmod/xtocmod.cpp celestia-1.5.0/src/tools/cmod/xtocmod.cpp
1172--- celestia-1.5.0-upstream/src/tools/cmod/xtocmod.cpp 2008-03-01 12:51:20.000000000 +0100
1173+++ celestia-1.5.0/src/tools/cmod/xtocmod.cpp 2008-03-01 11:53:31.000000000 +0100
1174@@ -3,6 +3,7 @@
1175 #include <iomanip>
1176 #include <algorithm>
1177 #include <cstdio>
1178+#include <string.h>
1179 #include <cassert>
1180 #include <cstring>
1181 #include <d3dx9.h>
1182diff -Naur celestia-1.5.0-upstream/src/tools/stardb/makestardb.cpp celestia-1.5.0/src/tools/stardb/makestardb.cpp
1183--- celestia-1.5.0-upstream/src/tools/stardb/makestardb.cpp 2008-03-01 12:51:20.000000000 +0100
1184+++ celestia-1.5.0/src/tools/stardb/makestardb.cpp 2008-03-01 11:53:34.000000000 +0100
1185@@ -14,6 +14,7 @@
1186 #include <iomanip>
1187 #include <cctype>
1188 #include <cassert>
1189+#include <string.h>
1190 #include <celutil/basictypes.h>
1191 #include <celutil/bytes.h>
1192 #include <celengine/astro.h>
1193diff -Naur celestia-1.5.0-upstream/src/tools/stardb/startextdump.cpp celestia-1.5.0/src/tools/stardb/startextdump.cpp
1194--- celestia-1.5.0-upstream/src/tools/stardb/startextdump.cpp 2008-03-01 12:51:20.000000000 +0100
1195+++ celestia-1.5.0/src/tools/stardb/startextdump.cpp 2008-03-01 11:53:40.000000000 +0100
1196@@ -13,6 +13,7 @@
1197 #include <iostream>
1198 #include <fstream>
1199 #include <iomanip>
1200+#include <string.h>
1201 #include <celutil/basictypes.h>
1202 #include <celutil/bytes.h>
1203 #include <celengine/astro.h>
A real-time visual space simulation
This page took 0.325767 seconds and 4 git commands to generate.