Marek Mahut <mmahut@fedoraproject.org>: Fix problems with compilation under gcc 4.3 Lubomir Rintel <lkundrak@v3.sk>: Adjust for celestia 1.5.1 diff -up celestia-1.5.1/src/buildstardb.cpp.gcc43 celestia-1.5.1/src/buildstardb.cpp --- celestia-1.5.1/src/buildstardb.cpp.gcc43 2008-04-23 23:17:20.000000000 +0200 +++ celestia-1.5.1/src/buildstardb.cpp 2009-04-12 17:01:35.854035658 +0200 @@ -17,6 +17,7 @@ #include <assert.h> #include <unistd.h> #include "celengine/stardb.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/asterism.cpp.gcc43 celestia-1.5.1/src/celengine/asterism.cpp --- celestia-1.5.1/src/celengine/asterism.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/asterism.cpp 2009-04-12 17:01:35.869035253 +0200 @@ -8,6 +8,7 @@ // of the License, or (at your option) any later version. #include <algorithm> +#include <libintl.h> #ifndef _WIN32 #ifndef TARGET_OS_MAC diff -up celestia-1.5.1/src/celengine/astro.cpp.gcc43 celestia-1.5.1/src/celengine/astro.cpp --- celestia-1.5.1/src/celengine/astro.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/astro.cpp 2009-04-12 17:01:35.891034976 +0200 @@ -10,12 +10,14 @@ #include <cmath> #include <iomanip> #include <cstdio> +#include <cstring> #include <time.h> #include <celutil/basictypes.h> #include <celmath/mathlib.h> #include "celestia.h" #include "astro.h" #include <celutil/util.h> +#include <libintl.h> #ifndef TARGET_OS_MAC #ifdef __GNUC__ diff -up celestia-1.5.1/src/celengine/body.cpp.gcc43 celestia-1.5.1/src/celengine/body.cpp --- celestia-1.5.1/src/celengine/body.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/body.cpp 2009-04-12 17:01:35.894034113 +0200 @@ -14,6 +14,7 @@ #include <celmath/mathlib.h> #include <celutil/util.h> #include <celutil/utf8.h> +#include <libintl.h> #include "mesh.h" #include "meshmanager.h" #include "body.h" diff -up celestia-1.5.1/src/celengine/cmdparser.cpp.gcc43 celestia-1.5.1/src/celengine/cmdparser.cpp --- celestia-1.5.1/src/celengine/cmdparser.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/cmdparser.cpp 2009-04-12 17:01:35.898035104 +0200 @@ -30,6 +30,7 @@ #include "astro.h" #include "cmdparser.h" #include "glcontext.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/console.cpp.gcc43 celestia-1.5.1/src/celengine/console.cpp --- celestia-1.5.1/src/celengine/console.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/console.cpp 2009-04-12 17:01:35.901036196 +0200 @@ -10,6 +10,7 @@ #include <cstdarg> #include <cstdio> #include <cassert> +#include <cstring> #include "celutil/utf8.h" #include "gl.h" #include "vecgl.h" diff -up celestia-1.5.1/src/celengine/dds.cpp.gcc43 celestia-1.5.1/src/celengine/dds.cpp --- celestia-1.5.1/src/celengine/dds.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/dds.cpp 2009-04-12 17:01:35.903036273 +0200 @@ -15,6 +15,7 @@ #include <celengine/gl.h> #include <celengine/glext.h> #include <celengine/image.h> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/dsodb.cpp.gcc43 celestia-1.5.1/src/celengine/dsodb.cpp --- celestia-1.5.1/src/celengine/dsodb.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/dsodb.cpp 2009-04-12 17:01:35.914035435 +0200 @@ -32,6 +32,7 @@ #include <celengine/galaxy.h> #include <celengine/opencluster.h> #include <celengine/nebula.h> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/fragmentprog.cpp.gcc43 celestia-1.5.1/src/celengine/fragmentprog.cpp --- celestia-1.5.1/src/celengine/fragmentprog.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/fragmentprog.cpp 2009-04-12 17:01:35.917035969 +0200 @@ -13,6 +13,7 @@ #include "gl.h" #include "glext.h" #include "fragmentprog.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/galaxy.cpp.gcc43 celestia-1.5.1/src/celengine/galaxy.cpp --- celestia-1.5.1/src/celengine/galaxy.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/galaxy.cpp 2009-04-12 17:01:35.942035387 +0200 @@ -23,6 +23,8 @@ #include "vecgl.h" #include "render.h" #include "texture.h" +#include <libintl.h> +#include <string.h> using namespace std; diff -up celestia-1.5.1/src/celengine/glcontext.cpp.gcc43 celestia-1.5.1/src/celengine/glcontext.cpp --- celestia-1.5.1/src/celengine/glcontext.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/glcontext.cpp 2009-04-12 17:01:35.945035362 +0200 @@ -12,6 +12,7 @@ #include "gl.h" #include "glext.h" #include "glcontext.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/glext.cpp.gcc43 celestia-1.5.1/src/celengine/glext.cpp --- celestia-1.5.1/src/celengine/glext.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/glext.cpp 2009-04-12 17:01:35.949035235 +0200 @@ -8,6 +8,7 @@ // of the License, or (at your option) any later version. #include <string.h> +#include <cstring> #include "gl.h" #ifndef _WIN32 @@ -19,6 +20,7 @@ #endif /* ! _WIN32 */ #include "glext.h" +#include <libintl.h> // ARB_texture_compression glx::PFNGLCOMPRESSEDTEXIMAGE3DARBPROC glx::glCompressedTexImage3DARB; diff -up celestia-1.5.1/src/celengine/image.cpp.gcc43 celestia-1.5.1/src/celengine/image.cpp --- celestia-1.5.1/src/celengine/image.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/image.cpp 2009-04-12 17:01:35.981035619 +0200 @@ -66,6 +66,7 @@ extern "C" { #include <iostream> #include <algorithm> #include <cmath> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/location.cpp.gcc43 celestia-1.5.1/src/celengine/location.cpp --- celestia-1.5.1/src/celengine/location.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/location.cpp 2009-04-12 17:01:35.984035874 +0200 @@ -11,6 +11,7 @@ #include <celengine/location.h> #include <celengine/body.h> #include <celutil/util.h> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/lodspheremesh.cpp.gcc43 celestia-1.5.1/src/celengine/lodspheremesh.cpp --- celestia-1.5.1/src/celengine/lodspheremesh.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/lodspheremesh.cpp 2009-04-12 17:01:35.988035468 +0200 @@ -17,6 +17,7 @@ #include "glext.h" #include "vecgl.h" #include "lodspheremesh.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/marker.cpp.gcc43 celestia-1.5.1/src/celengine/marker.cpp --- celestia-1.5.1/src/celengine/marker.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/marker.cpp 2009-04-12 17:01:35.991035163 +0200 @@ -9,6 +9,7 @@ #include "marker.h" #include "gl.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/mesh.cpp.gcc43 celestia-1.5.1/src/celengine/mesh.cpp --- celestia-1.5.1/src/celengine/mesh.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/mesh.cpp 2009-04-12 17:01:35.995034199 +0200 @@ -14,6 +14,7 @@ #include <cassert> #include <iostream> #include <algorithm> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/meshmanager.cpp.gcc43 celestia-1.5.1/src/celengine/meshmanager.cpp --- celestia-1.5.1/src/celengine/meshmanager.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/meshmanager.cpp 2009-04-12 17:01:35.998035291 +0200 @@ -26,6 +26,7 @@ #include "spheremesh.h" #include "texmanager.h" #include "meshmanager.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/modelfile.cpp.gcc43 celestia-1.5.1/src/celengine/modelfile.cpp --- celestia-1.5.1/src/celengine/modelfile.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/modelfile.cpp 2009-04-12 17:01:36.003035622 +0200 @@ -15,6 +15,8 @@ #include <cassert> #include <cmath> #include <cstdio> +#include <libintl.h> +#include <string.h> using namespace std; diff -up celestia-1.5.1/src/celengine/nebula.cpp.gcc43 celestia-1.5.1/src/celengine/nebula.cpp --- celestia-1.5.1/src/celengine/nebula.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/nebula.cpp 2009-04-12 17:01:36.011036765 +0200 @@ -21,6 +21,7 @@ #include "glext.h" #include "vecgl.h" #include "render.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/opencluster.cpp.gcc43 celestia-1.5.1/src/celengine/opencluster.cpp --- celestia-1.5.1/src/celengine/opencluster.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/opencluster.cpp 2009-04-12 17:01:36.022036207 +0200 @@ -19,6 +19,7 @@ #include "gl.h" #include "vecgl.h" #include "render.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/overlay.cpp.gcc43 celestia-1.5.1/src/celengine/overlay.cpp --- celestia-1.5.1/src/celengine/overlay.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/overlay.cpp 2009-04-12 17:01:36.032035751 +0200 @@ -9,6 +9,7 @@ #include <cstdarg> #include <cstdio> +#include <cstring> #include <celutil/utf8.h> #include "gl.h" #include "vecgl.h" diff -up celestia-1.5.1/src/celengine/parseobject.cpp.gcc43 celestia-1.5.1/src/celengine/parseobject.cpp --- celestia-1.5.1/src/celengine/parseobject.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/parseobject.cpp 2009-04-12 17:01:36.039035041 +0200 @@ -21,6 +21,7 @@ #include "trajmanager.h" #include "rotationmanager.h" #include "universe.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/render.cpp.gcc43 celestia-1.5.1/src/celengine/render.cpp --- celestia-1.5.1/src/celengine/render.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/render.cpp 2009-04-12 17:01:36.081037762 +0200 @@ -11,6 +11,7 @@ #include <cstdio> #include <cstring> #include <cassert> +#include <libintl.h> #ifndef _WIN32 #ifndef TARGET_OS_MAC diff -up celestia-1.5.1/src/celengine/rotationmanager.cpp.gcc43 celestia-1.5.1/src/celengine/rotationmanager.cpp --- celestia-1.5.1/src/celengine/rotationmanager.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/rotationmanager.cpp 2009-04-12 17:01:36.120036038 +0200 @@ -14,6 +14,7 @@ #include <celutil/debug.h> #include "samporient.h" #include "rotationmanager.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/selection.cpp.gcc43 celestia-1.5.1/src/celengine/selection.cpp --- celestia-1.5.1/src/celengine/selection.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/selection.cpp 2009-04-12 17:01:36.123035175 +0200 @@ -8,6 +8,7 @@ // of the License, or (at your option) any later version. #include <cstdio> +#include <libintl.h> #include "astro.h" #include "selection.h" diff -up celestia-1.5.1/src/celengine/shadermanager.cpp.gcc43 celestia-1.5.1/src/celengine/shadermanager.cpp --- celestia-1.5.1/src/celengine/shadermanager.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/shadermanager.cpp 2009-04-12 17:01:36.168035077 +0200 @@ -15,6 +15,7 @@ #include <iomanip> #include <cstdio> #include <cassert> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/simulation.cpp.gcc43 celestia-1.5.1/src/celengine/simulation.cpp --- celestia-1.5.1/src/celengine/simulation.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/simulation.cpp 2009-04-12 17:01:36.171036170 +0200 @@ -11,6 +11,7 @@ // of the License, or (at your option) any later version. #include <algorithm> +#include <libintl.h> #include "simulation.h" using namespace std; diff -up celestia-1.5.1/src/celengine/solarsys.cpp.gcc43 celestia-1.5.1/src/celengine/solarsys.cpp --- celestia-1.5.1/src/celengine/solarsys.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/solarsys.cpp 2009-04-12 17:01:36.175035764 +0200 @@ -30,6 +30,7 @@ #include "universe.h" #include "multitexture.h" #include "parseobject.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/solarsysxml.cpp.gcc43 celestia-1.5.1/src/celengine/solarsysxml.cpp --- celestia-1.5.1/src/celengine/solarsysxml.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/solarsysxml.cpp 2009-04-12 17:01:36.224034701 +0200 @@ -8,6 +8,8 @@ // of the License, or (at your option) any later version. #include <cassert> +#include <cstring> +#include <string.h> #include <libxml/parser.h> #include <libxml/parserInternals.h> @@ -20,6 +22,7 @@ #include "texmanager.h" #include "meshmanager.h" #include "solarsysxml.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/spiceinterface.cpp.gcc43 celestia-1.5.1/src/celengine/spiceinterface.cpp --- celestia-1.5.1/src/celengine/spiceinterface.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/spiceinterface.cpp 2009-04-12 17:01:36.227035515 +0200 @@ -11,6 +11,7 @@ #include "SpiceUsr.h" #include "spiceinterface.h" +#include <libintl.h> bool diff -up celestia-1.5.1/src/celengine/spiceorbit.cpp.gcc43 celestia-1.5.1/src/celengine/spiceorbit.cpp --- celestia-1.5.1/src/celengine/spiceorbit.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/spiceorbit.cpp 2009-04-12 17:01:36.231033991 +0200 @@ -14,6 +14,7 @@ #include "SpiceUsr.h" #include "astro.h" #include "spiceorbit.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/stardb.cpp.gcc43 celestia-1.5.1/src/celengine/stardb.cpp --- celestia-1.5.1/src/celengine/stardb.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/stardb.cpp 2009-04-12 17:01:36.258036280 +0200 @@ -10,6 +10,7 @@ #include <cmath> #include <cstdlib> #include <cstdio> +#include <cstring> #include <cassert> #include <algorithm> #include <celmath/mathlib.h> @@ -24,6 +25,7 @@ #include "multitexture.h" #include "meshmanager.h" #include <celutil/debug.h> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/texmanager.cpp.gcc43 celestia-1.5.1/src/celengine/texmanager.cpp --- celestia-1.5.1/src/celengine/texmanager.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/texmanager.cpp 2009-04-12 17:01:36.264034832 +0200 @@ -13,6 +13,7 @@ #include <fstream> #include "multitexture.h" #include "texmanager.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/texture.cpp.gcc43 celestia-1.5.1/src/celengine/texture.cpp --- celestia-1.5.1/src/celengine/texture.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/texture.cpp 2009-04-12 17:01:36.271036357 +0200 @@ -28,6 +28,7 @@ #include <cstdlib> #include <cstdio> #include <cassert> +#include <libintl.h> #ifndef _WIN32 #ifndef TARGET_OS_MAC diff -up celestia-1.5.1/src/celengine/tokenizer.cpp.gcc43 celestia-1.5.1/src/celengine/tokenizer.cpp --- celestia-1.5.1/src/celengine/tokenizer.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/tokenizer.cpp 2009-04-12 17:01:36.278035367 +0200 @@ -12,6 +12,7 @@ #include <iomanip> #include <celutil/utf8.h> #include "tokenizer.h" +#include <libintl.h> static bool issep(char c) diff -up celestia-1.5.1/src/celengine/trajmanager.cpp.gcc43 celestia-1.5.1/src/celengine/trajmanager.cpp --- celestia-1.5.1/src/celengine/trajmanager.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/trajmanager.cpp 2009-04-12 17:01:36.280035443 +0200 @@ -15,6 +15,7 @@ #include <celutil/debug.h> #include "samporbit.h" #include "trajmanager.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/universe.cpp.gcc43 celestia-1.5.1/src/celengine/universe.cpp --- celestia-1.5.1/src/celengine/universe.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/universe.cpp 2009-04-12 17:01:36.322035650 +0200 @@ -13,6 +13,7 @@ #include <celmath/intersect.h> #include <celutil/utf8.h> #include <cassert> +#include <libintl.h> #include "astro.h" #include "3dsmesh.h" #include "meshmanager.h" diff -up celestia-1.5.1/src/celengine/vertexprog.cpp.gcc43 celestia-1.5.1/src/celengine/vertexprog.cpp --- celestia-1.5.1/src/celengine/vertexprog.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/vertexprog.cpp 2009-04-12 17:01:36.325035346 +0200 @@ -14,6 +14,7 @@ #include "gl.h" #include "glext.h" #include "vertexprog.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celengine/virtualtex.cpp.gcc43 celestia-1.5.1/src/celengine/virtualtex.cpp --- celestia-1.5.1/src/celengine/virtualtex.cpp.gcc43 2008-04-23 23:17:16.000000000 +0200 +++ celestia-1.5.1/src/celengine/virtualtex.cpp 2009-04-12 17:01:36.328035879 +0200 @@ -19,6 +19,7 @@ #include "virtualtex.h" #include "gl.h" #include "parser.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celestia/celestiacore.cpp.gcc43 celestia-1.5.1/src/celestia/celestiacore.cpp --- celestia-1.5.1/src/celestia/celestiacore.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/celestiacore.cpp 2009-04-12 17:01:36.360034867 +0200 @@ -43,6 +43,7 @@ #include <celutil/debug.h> #include <celutil/utf8.h> #include "url.h" +#include <libintl.h> #ifdef CELX #include <celengine/scriptobject.h> diff -up celestia-1.5.1/src/celestia/celx.cpp.gcc43 celestia-1.5.1/src/celestia/celx.cpp --- celestia-1.5.1/src/celestia/celx.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/celx.cpp 2009-04-12 17:01:36.404034591 +0200 @@ -11,7 +11,9 @@ #include <cassert> #include <cstring> +#include <string.h> #include <cstdio> +#include <libintl.h> #include <map> #include <celengine/astro.h> #include <celengine/celestia.h> diff -up celestia-1.5.1/src/celestia/configfile.cpp.gcc43 celestia-1.5.1/src/celestia/configfile.cpp --- celestia-1.5.1/src/celestia/configfile.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/configfile.cpp 2009-04-12 17:01:36.444035839 +0200 @@ -16,6 +16,7 @@ #include <celengine/celestia.h> #include <celengine/texmanager.h> #include "configfile.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celestia/destination.cpp.gcc43 celestia-1.5.1/src/celestia/destination.cpp --- celestia-1.5.1/src/celestia/destination.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/destination.cpp 2009-04-12 17:01:36.445036017 +0200 @@ -14,6 +14,7 @@ #include <celengine/astro.h> #include <celengine/parser.h> #include "destination.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celestia/eclipsefinder.cpp.gcc43 celestia-1.5.1/src/celestia/eclipsefinder.cpp --- celestia-1.5.1/src/celestia/eclipsefinder.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/eclipsefinder.cpp 2009-04-12 17:01:36.447035814 +0200 @@ -15,6 +15,7 @@ #include <algorithm> #include <set> #include <cassert> +#include <cstring> #include "eclipsefinder.h" #include "celmath/mathlib.h" #include "celmath/ray.h" diff -up celestia-1.5.1/src/celestia/glutmain.cpp.gcc43 celestia-1.5.1/src/celestia/glutmain.cpp --- celestia-1.5.1/src/celestia/glutmain.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/glutmain.cpp 2009-04-12 17:01:36.450034950 +0200 @@ -15,6 +15,7 @@ #include <cstdlib> #include <cctype> #include <cstring> +#include <libintl.h> #include <time.h> #include <unistd.h> #include <celengine/gl.h> diff -up celestia-1.5.1/src/celestia/gtk/actions.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/actions.cpp --- celestia-1.5.1/src/celestia/gtk/actions.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/actions.cpp 2009-04-12 17:01:36.486035487 +0200 @@ -15,6 +15,7 @@ #endif /* HAVE_CONFIG_H */ #include <cstring> +#include <libintl.h> #include <fstream> #include <gtk/gtk.h> diff -up celestia-1.5.1/src/celestia/gtk/common.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/common.cpp --- celestia-1.5.1/src/celestia/gtk/common.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/common.cpp 2009-04-12 17:01:36.488035564 +0200 @@ -20,6 +20,7 @@ #include <celestia/celestiacore.h> #include "common.h" +#include <libintl.h> /* Returns the offset of the timezone at date */ diff -up celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp --- celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp 2009-04-12 17:01:36.491036097 +0200 @@ -18,6 +18,7 @@ #include "dialog-eclipse.h" #include "common.h" +#include <libintl.h> /* Definitions: Callbacks */ diff -up celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp --- celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp 2009-04-12 17:01:36.493035335 +0200 @@ -18,6 +18,7 @@ #include "dialog-goto.h" #include "common.h" +#include <libintl.h> /* Declarations: Callbacks */ diff -up celestia-1.5.1/src/celestia/gtk/dialog-options.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-options.cpp --- celestia-1.5.1/src/celestia/gtk/dialog-options.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/dialog-options.cpp 2009-04-12 17:01:36.496036707 +0200 @@ -17,6 +17,7 @@ #include "dialog-options.h" #include "common.h" #include "ui.h" +#include <libintl.h> /* Definitions: Callbacks */ diff -up celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp --- celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp 2009-04-12 17:01:36.498036784 +0200 @@ -22,6 +22,7 @@ #include "dialog-solar.h" #include "actions.h" #include "common.h" +#include <libintl.h> /* Declarations: Callbacks */ diff -up celestia-1.5.1/src/celestia/gtk/dialog-star.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-star.cpp --- celestia-1.5.1/src/celestia/gtk/dialog-star.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/dialog-star.cpp 2009-04-12 17:01:36.503035158 +0200 @@ -25,6 +25,7 @@ #include "dialog-star.h" #include "actions.h" #include "common.h" +#include <libintl.h> /* Declarations: Callbacks */ diff -up celestia-1.5.1/src/celestia/gtk/dialog-time.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-time.cpp --- celestia-1.5.1/src/celestia/gtk/dialog-time.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/dialog-time.cpp 2009-04-12 17:01:36.505035235 +0200 @@ -18,6 +18,7 @@ #include "dialog-time.h" #include "common.h" +#include <libintl.h> /* Declarations: Callbacks */ diff -up celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp --- celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp 2009-04-12 17:01:36.507035590 +0200 @@ -18,6 +18,7 @@ #include "dialog-tour.h" #include "common.h" +#include <libintl.h> /* Declarations: Callbacks */ diff -up celestia-1.5.1/src/celestia/gtk/main.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/main.cpp --- celestia-1.5.1/src/celestia/gtk/main.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/main.cpp 2009-04-12 17:01:36.510036404 +0200 @@ -19,6 +19,7 @@ #include <cstdlib> #include <cctype> #include <cstring> +#include <libintl.h> #include <time.h> #ifdef WIN32 diff -up celestia-1.5.1/src/celestia/gtk/menu-context.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/menu-context.cpp --- celestia-1.5.1/src/celestia/gtk/menu-context.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/menu-context.cpp 2009-04-12 17:01:36.513036658 +0200 @@ -20,6 +20,7 @@ #include "menu-context.h" #include "actions.h" #include "common.h" +#include <libintl.h> /* Definitions: Callbacks */ diff -up celestia-1.5.1/src/celestia/gtk/settings-file.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/settings-file.cpp --- celestia-1.5.1/src/celestia/gtk/settings-file.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/settings-file.cpp 2009-04-12 17:01:36.517035414 +0200 @@ -11,6 +11,7 @@ */ #include <gtk/gtk.h> +#include <libintl.h> #include <celengine/body.h> #include <celengine/galaxy.h> diff -up celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp --- celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp 2009-04-12 17:01:36.520035389 +0200 @@ -12,6 +12,7 @@ #include <gtk/gtk.h> #include <gconf/gconf-client.h> +#include <libintl.h> #include <celengine/body.h> #include <celengine/galaxy.h> diff -up celestia-1.5.1/src/celestia/gtk/splash.cpp.gcc43 celestia-1.5.1/src/celestia/gtk/splash.cpp --- celestia-1.5.1/src/celestia/gtk/splash.cpp.gcc43 2008-04-23 23:16:49.000000000 +0200 +++ celestia-1.5.1/src/celestia/gtk/splash.cpp 2009-04-12 17:01:36.523035643 +0200 @@ -22,6 +22,7 @@ #include "splash.h" #include "common.h" +#include <libintl.h> /* Declarations */ diff -up celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp.gcc43 celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp --- celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp 2009-04-12 17:01:36.544035746 +0200 @@ -16,6 +16,7 @@ #include "cellistviewitem.h" #include "selectionpopup.h" #include "celutil/utf8.h" +#include <libintl.h> /* * Constructs a CelestialBrowser which is a child of 'parent', with the diff -up celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp.gcc43 celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp --- celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp 2009-04-12 17:01:36.570035342 +0200 @@ -22,6 +22,7 @@ #include <kglobalsettings.h> #include <celsplashscreen.h> #include <X11/Xlib.h> +#include <libintl.h> CelSplashScreen::CelSplashScreen(const QString& filename, QWidget* _parent): QWidget(0, 0, WStyle_Customize | WX11BypassWM), diff -up celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp.gcc43 celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp --- celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp 2009-04-12 17:01:36.573036714 +0200 @@ -11,6 +11,7 @@ #include "celestiacore.h" #include "celengine/astro.h" #include "eclipsefinder.h" +#include <libintl.h> /* * Constructs a EclipseFinder which is a child of 'parent', with the diff -up celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp --- celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp 2009-04-12 17:01:36.575035393 +0200 @@ -19,6 +19,7 @@ #include <qdir.h> #include <kstandarddirs.h> #include "kcelbookmarkmanager.h" +#include <libintl.h> KBookmarkManager* KCelBookmarkManager::self() { if ( !s_bookmarkManager ) diff -up celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp --- celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp 2009-04-12 17:01:36.578036486 +0200 @@ -45,6 +45,7 @@ #include <kpopupmenu.h> #include <kstdaccel.h> #include <kstdaction.h> +#include <libintl.h> template class QPtrList<KCelBookmarkMenu>; diff -up celestia-1.5.1/src/celestia/kde/kdeapp.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdeapp.cpp --- celestia-1.5.1/src/celestia/kde/kdeapp.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/kdeapp.cpp 2009-04-12 17:01:36.606037275 +0200 @@ -87,6 +87,7 @@ #endif #include "celengine/glext.h" +#include <libintl.h> #define MENUMAXSIZE 100 diff -up celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp --- celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp 2009-04-12 17:01:36.610034914 +0200 @@ -48,6 +48,7 @@ #include <math.h> #include <vector> +#include <libintl.h> KdeGlWidget::KdeGlWidget( QWidget* parent, const char* name, CelestiaCore* core) : QGLWidget( parent, name ) diff -up celestia-1.5.1/src/celestia/kde/kdemain.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdemain.cpp --- celestia-1.5.1/src/celestia/kde/kdemain.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/kdemain.cpp 2009-04-12 17:01:36.611035650 +0200 @@ -20,6 +20,7 @@ #include <klocale.h> #include "kdeuniquecelestia.h" +#include <libintl.h> static const char *description = I18N_NOOP("Celestia"); diff -up celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp --- celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp 2009-04-12 17:01:36.615035244 +0200 @@ -40,6 +40,7 @@ #include "celengine/render.h" #include "celengine/glcontext.h" #include "celengine/astro.h" +#include <libintl.h> static uint32 FilterOtherLocations = ~(Location::City | Location::Observatory | diff -up celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp.gcc43 celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp --- celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp 2009-04-12 17:01:36.617036717 +0200 @@ -21,6 +21,7 @@ #include <string> #include <vector> #include <klocale.h> +#include <libintl.h> KdeUniqueCelestia::KdeUniqueCelestia() { diff -up celestia-1.5.1/src/celestia/kde/selectionpopup.cpp.gcc43 celestia-1.5.1/src/celestia/kde/selectionpopup.cpp --- celestia-1.5.1/src/celestia/kde/selectionpopup.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/selectionpopup.cpp 2009-04-12 17:01:36.619035956 +0200 @@ -29,6 +29,7 @@ #include <krun.h> #include "celutil/utf8.h" +#include <libintl.h> SelectionPopup::SelectionPopup(QWidget* parent, CelestiaCore* _appCore, Selection _sel): KPopupMenu(parent), diff -up celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp.gcc43 celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp --- celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp.gcc43 2008-04-23 23:17:05.000000000 +0200 +++ celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp 2009-04-12 17:01:36.623035270 +0200 @@ -36,6 +36,7 @@ #include <kstatusbar.h> #include <kapp.h> #include "kdeapp.h" +#include <libintl.h> VideoCaptureDlg::VideoCaptureDlg(QWidget* p, const QString &dir): accepted(false) diff -up celestia-1.5.1/src/celestia/oggtheoracapture.cpp.gcc43 celestia-1.5.1/src/celestia/oggtheoracapture.cpp --- celestia-1.5.1/src/celestia/oggtheoracapture.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/oggtheoracapture.cpp 2009-04-12 17:01:36.688033701 +0200 @@ -66,11 +66,13 @@ #include <celutil/util.h> #include "../celengine/gl.h" #include <string> +#include <cstring> #include "theora/theora.h" using namespace std; #include "oggtheoracapture.h" +#include <libintl.h> // {"video-rate-target",required_argument,NULL,'V'}, // {"video-quality",required_argument,NULL,'v'}, diff -up celestia-1.5.1/src/celestia/scriptmenu.cpp.gcc43 celestia-1.5.1/src/celestia/scriptmenu.cpp --- celestia-1.5.1/src/celestia/scriptmenu.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/scriptmenu.cpp 2009-04-12 17:01:36.724036472 +0200 @@ -13,6 +13,7 @@ #include "celutil/directory.h" #include "celutil/filetype.h" #include <fstream> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celestia/url.cpp.gcc43 celestia-1.5.1/src/celestia/url.cpp --- celestia-1.5.1/src/celestia/url.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/url.cpp 2009-04-12 17:01:36.727036726 +0200 @@ -16,10 +16,12 @@ ***************************************************************************/ #include <string> +#include <string.h> #include <stdio.h> #include "celestiacore.h" #include "celengine/astro.h" #include "url.h" +#include <libintl.h> static const unsigned int CurrentCelestiaURLVersion = 2; diff -up celestia-1.5.1/src/celestia/wglext.cpp.gcc43 celestia-1.5.1/src/celestia/wglext.cpp --- celestia-1.5.1/src/celestia/wglext.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/wglext.cpp 2009-04-12 17:01:36.729034847 +0200 @@ -14,7 +14,10 @@ #include "wglext.h" #include <windows.h> #include <cstdio> +#include <cstring> +#include <string.h> #include <vector> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celestia/winbookmarks.cpp.gcc43 celestia-1.5.1/src/celestia/winbookmarks.cpp --- celestia-1.5.1/src/celestia/winbookmarks.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/winbookmarks.cpp 2009-04-12 17:01:36.733035559 +0200 @@ -13,6 +13,7 @@ #include "res/resource.h" #include <celutil/winutil.h> #include <iostream> +#include <string.h> using namespace std; diff -up celestia-1.5.1/src/celestia/windatepicker.cpp.gcc43 celestia-1.5.1/src/celestia/windatepicker.cpp --- celestia-1.5.1/src/celestia/windatepicker.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/windatepicker.cpp 2009-04-12 17:01:36.736034975 +0200 @@ -11,10 +11,12 @@ #include <windows.h> #include <commctrl.h> +#include <cstring> #include "celutil/basictypes.h" #include "celengine/astro.h" #include "celutil/util.h" #include "celutil/winutil.h" +#include <libintl.h> // DatePicker is a Win32 control for setting the date. It replaces the diff -up celestia-1.5.1/src/celestia/wineclipses.cpp.gcc43 celestia-1.5.1/src/celestia/wineclipses.cpp --- celestia-1.5.1/src/celestia/wineclipses.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/wineclipses.cpp 2009-04-12 17:01:36.739035509 +0200 @@ -10,6 +10,7 @@ #include <string> #include <sstream> +#include <string.h> #include <algorithm> #include <set> #include <cassert> @@ -23,6 +24,7 @@ #include "celmath/distance.h" #include "celutil/util.h" #include "celutil/winutil.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celestia/winhyperlinks.cpp.gcc43 celestia-1.5.1/src/celestia/winhyperlinks.cpp --- celestia-1.5.1/src/celestia/winhyperlinks.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/winhyperlinks.cpp 2009-04-12 17:01:36.741035864 +0200 @@ -9,6 +9,7 @@ // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. +#include <cstring> #include "winhyperlinks.h" #include "res/resource.h" diff -up celestia-1.5.1/src/celestia/winmain.cpp.gcc43 celestia-1.5.1/src/celestia/winmain.cpp --- celestia-1.5.1/src/celestia/winmain.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/winmain.cpp 2009-04-12 17:01:36.779035359 +0200 @@ -23,6 +23,7 @@ #include <windows.h> #include <commctrl.h> #include <mmsystem.h> +#include <string.h> #include <celmath/vecmath.h> #include <celmath/quaternion.h> @@ -59,6 +60,7 @@ #include "wglext.h" #include <locale.h> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celestia/winsplash.cpp.gcc43 celestia-1.5.1/src/celestia/winsplash.cpp --- celestia-1.5.1/src/celestia/winsplash.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/winsplash.cpp 2009-04-12 17:02:44.303036196 +0200 @@ -17,6 +17,7 @@ #include "celutil/util.h" #include <iostream> #include <locale.h> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celestia/winstarbrowser.cpp.gcc43 celestia-1.5.1/src/celestia/winstarbrowser.cpp --- celestia-1.5.1/src/celestia/winstarbrowser.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/winstarbrowser.cpp 2009-04-12 17:01:36.788035284 +0200 @@ -15,10 +15,12 @@ #include <windows.h> #include <commctrl.h> #include <cstring> +#include <string.h> #include "winstarbrowser.h" #include "celutil/winutil.h" #include "res/resource.h" +#include <libintl.h> extern void SetMouseCursor(LPCTSTR lpCursor); diff -up celestia-1.5.1/src/celestia/wintime.cpp.gcc43 celestia-1.5.1/src/celestia/wintime.cpp --- celestia-1.5.1/src/celestia/wintime.cpp.gcc43 2008-04-23 23:17:06.000000000 +0200 +++ celestia-1.5.1/src/celestia/wintime.cpp 2009-04-12 17:01:36.790036758 +0200 @@ -18,6 +18,7 @@ #include <celengine/astro.h> #include "celutil/util.h" #include "celutil/winutil.h" +#include <libintl.h> diff -up celestia-1.5.1/src/celmath/quaternion.h.gcc43 celestia-1.5.1/src/celmath/quaternion.h --- celestia-1.5.1/src/celmath/quaternion.h.gcc43 2008-04-23 23:17:20.000000000 +0200 +++ celestia-1.5.1/src/celmath/quaternion.h 2009-04-12 17:01:36.843035010 +0200 @@ -16,7 +16,6 @@ #include <celmath/mathlib.h> #include <celmath/vecmath.h> - template<class T> class Quaternion { public: diff -up celestia-1.5.1/src/celutil/bigfix.cpp.gcc43 celestia-1.5.1/src/celutil/bigfix.cpp --- celestia-1.5.1/src/celutil/bigfix.cpp.gcc43 2008-04-23 23:17:19.000000000 +0200 +++ celestia-1.5.1/src/celutil/bigfix.cpp 2009-04-12 17:01:36.846036381 +0200 @@ -10,6 +10,7 @@ #include <math.h> #include <stdio.h> #include "bigfix.h" +#include <libintl.h> /*** Constructors ***/ diff -up celestia-1.5.1/src/celutil/color.cpp.gcc43 celestia-1.5.1/src/celutil/color.cpp --- celestia-1.5.1/src/celutil/color.cpp.gcc43 2008-04-23 23:17:19.000000000 +0200 +++ celestia-1.5.1/src/celutil/color.cpp 2009-04-12 17:01:36.847034883 +0200 @@ -9,6 +9,7 @@ #include <cstdio> #include <cstring> +#include <string.h> #include <cctype> #include "color.h" diff -up celestia-1.5.1/src/celutil/directory.cpp.gcc43 celestia-1.5.1/src/celutil/directory.cpp --- celestia-1.5.1/src/celutil/directory.cpp.gcc43 2008-04-23 23:17:19.000000000 +0200 +++ celestia-1.5.1/src/celutil/directory.cpp 2009-04-12 17:01:36.849035239 +0200 @@ -9,6 +9,7 @@ #include <iostream> #include "directory.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celutil/filetype.cpp.gcc43 celestia-1.5.1/src/celutil/filetype.cpp --- celestia-1.5.1/src/celutil/filetype.cpp.gcc43 2008-04-23 23:17:19.000000000 +0200 +++ celestia-1.5.1/src/celutil/filetype.cpp 2009-04-12 17:01:36.850034858 +0200 @@ -11,6 +11,7 @@ #include <cstdlib> #include "util.h" #include "filetype.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celutil/formatnum.cpp.gcc43 celestia-1.5.1/src/celutil/formatnum.cpp --- celestia-1.5.1/src/celutil/formatnum.cpp.gcc43 2008-04-23 23:17:19.000000000 +0200 +++ celestia-1.5.1/src/celutil/formatnum.cpp 2009-04-12 17:01:36.852036051 +0200 @@ -10,6 +10,8 @@ #include <cmath> #include <cstdio> #include <string> +#include <cstring> +#include <limits.h> #include "formatnum.h" // HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf diff -up celestia-1.5.1/src/celutil/utf8.cpp.gcc43 celestia-1.5.1/src/celutil/utf8.cpp --- celestia-1.5.1/src/celutil/utf8.cpp.gcc43 2008-04-23 23:17:19.000000000 +0200 +++ celestia-1.5.1/src/celutil/utf8.cpp 2009-04-12 17:01:36.856035366 +0200 @@ -9,7 +9,9 @@ #include "utf8.h" #include <cctype> +#include <cstring> #include "util.h" +#include <libintl.h> unsigned int WGL4_Normalization_00[256] = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, diff -up celestia-1.5.1/src/celutil/util.cpp.gcc43 celestia-1.5.1/src/celutil/util.cpp --- celestia-1.5.1/src/celutil/util.cpp.gcc43 2008-04-23 23:17:19.000000000 +0200 +++ celestia-1.5.1/src/celutil/util.cpp 2009-04-12 17:01:36.858036560 +0200 @@ -12,6 +12,7 @@ #include "util.h" #include <sys/types.h> #include <sys/stat.h> +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/celutil/util.h.gcc43 celestia-1.5.1/src/celutil/util.h --- celestia-1.5.1/src/celutil/util.h.gcc43 2008-04-23 23:17:19.000000000 +0200 +++ celestia-1.5.1/src/celutil/util.h 2009-04-12 17:01:36.860035519 +0200 @@ -22,11 +22,11 @@ switch(0){case 0: case pred:;} #ifndef min -#define min(a, b) ((a) < (b) ? (a) : (b)) +template <typename T1, typename T2> bool min(T1 a, T2 b){ return a<(T1)b; } #endif #ifndef max -#define max(a, b) ((a) < (b) ? (b) : (a)) +template <typename T1, typename T2> bool max(T1 a, T2 b){ return a<(T1)b; } #endif #ifdef _WIN32 diff -up celestia-1.5.1/src/celutil/windirectory.cpp.gcc43 celestia-1.5.1/src/celutil/windirectory.cpp --- celestia-1.5.1/src/celutil/windirectory.cpp.gcc43 2008-04-23 23:17:19.000000000 +0200 +++ celestia-1.5.1/src/celutil/windirectory.cpp 2009-04-12 17:01:36.862036154 +0200 @@ -10,6 +10,7 @@ #include <iostream> #include <windows.h> #include "directory.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/packdb.cpp.gcc43 celestia-1.5.1/src/packdb.cpp --- celestia-1.5.1/src/packdb.cpp.gcc43 2008-04-23 23:17:20.000000000 +0200 +++ celestia-1.5.1/src/packdb.cpp 2009-04-12 17:01:36.864035392 +0200 @@ -10,6 +10,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <libintl.h> #define SPECTRAL_O 0 #define SPECTRAL_B 1 diff -up celestia-1.5.1/src/tools/atmosphere/scattersim.cpp.gcc43 celestia-1.5.1/src/tools/atmosphere/scattersim.cpp --- celestia-1.5.1/src/tools/atmosphere/scattersim.cpp.gcc43 2008-04-23 23:17:18.000000000 +0200 +++ celestia-1.5.1/src/tools/atmosphere/scattersim.cpp 2009-04-12 17:01:36.893039712 +0200 @@ -11,7 +11,9 @@ #include <iostream> #include <fstream> #include <string> +#include <string.h> #include <cstdlib> +#include <libintl.h> #include <cmath> #include <algorithm> #include <map> diff -up celestia-1.5.1/src/tools/buildstardb.cpp.gcc43 celestia-1.5.1/src/tools/buildstardb.cpp --- celestia-1.5.1/src/tools/buildstardb.cpp.gcc43 2008-04-23 23:17:18.000000000 +0200 +++ celestia-1.5.1/src/tools/buildstardb.cpp 2009-04-12 17:01:36.932034915 +0200 @@ -16,6 +16,7 @@ #include <cstdio> #include <assert.h> #include "stardb.h" +#include <libintl.h> using namespace std; diff -up celestia-1.5.1/src/tools/cmod/cmodfix.cpp.gcc43 celestia-1.5.1/src/tools/cmod/cmodfix.cpp --- celestia-1.5.1/src/tools/cmod/cmodfix.cpp.gcc43 2008-04-23 23:17:17.000000000 +0200 +++ celestia-1.5.1/src/tools/cmod/cmodfix.cpp 2009-04-12 17:01:36.959036645 +0200 @@ -18,6 +18,7 @@ #include <cassert> #include <cmath> #include <cstdio> +#include <string.h> #include <algorithm> #include <vector> #ifdef TRISTRIP diff -up celestia-1.5.1/src/tools/cmod/xtocmod.cpp.gcc43 celestia-1.5.1/src/tools/cmod/xtocmod.cpp --- celestia-1.5.1/src/tools/cmod/xtocmod.cpp.gcc43 2008-04-23 23:17:17.000000000 +0200 +++ celestia-1.5.1/src/tools/cmod/xtocmod.cpp 2009-04-12 17:01:36.962036340 +0200 @@ -3,6 +3,7 @@ #include <iomanip> #include <algorithm> #include <cstdio> +#include <string.h> #include <cassert> #include <cstring> #include <d3dx9.h> diff -up celestia-1.5.1/src/tools/stardb/makestardb.cpp.gcc43 celestia-1.5.1/src/tools/stardb/makestardb.cpp --- celestia-1.5.1/src/tools/stardb/makestardb.cpp.gcc43 2008-04-23 23:17:17.000000000 +0200 +++ celestia-1.5.1/src/tools/stardb/makestardb.cpp 2009-04-12 17:01:36.964036696 +0200 @@ -14,6 +14,7 @@ #include <iomanip> #include <cctype> #include <cassert> +#include <string.h> #include <celutil/basictypes.h> #include <celutil/bytes.h> #include <celengine/astro.h> diff -up celestia-1.5.1/src/tools/stardb/startextdump.cpp.gcc43 celestia-1.5.1/src/tools/stardb/startextdump.cpp --- celestia-1.5.1/src/tools/stardb/startextdump.cpp.gcc43 2008-04-23 23:17:17.000000000 +0200 +++ celestia-1.5.1/src/tools/stardb/startextdump.cpp 2009-04-12 17:01:36.982035707 +0200 @@ -13,6 +13,7 @@ #include <iostream> #include <fstream> #include <iomanip> +#include <string.h> #include <celutil/basictypes.h> #include <celutil/bytes.h> #include <celengine/astro.h>