Fixes to make Celestia build with gcc4.3

src/celengine/astro.cpp

@@ -7,6 +7,7 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
+#include <cstring>
 #include <cmath>
 #include <iomanip>
 #include <cstdio>

src/celengine/command.cpp

@@ -562,7 +562,7 @@ CommandSetGalaxyLightGain::CommandSetGalaxyLightGain(float gain) :
 {
 }
 
-void CommandSetGalaxyLightGain::process(ExecutionEnvironment& env)
+void CommandSetGalaxyLightGain::process(ExecutionEnvironment& /* env */)
 {
     Galaxy::setLightGain(lightGain);
 }
@@ -697,8 +697,9 @@ CommandCapture::CommandCapture(const std::string& _type,
 
 void CommandCapture::process(ExecutionEnvironment&)
 {
-    bool success = false;
 #ifndef TARGET_OS_MAC
+    bool success = false;
+
 
     // Get the dimensions of the current viewport
     int viewport[4];
@@ -867,7 +868,7 @@ CommandSetLineColor::CommandSetLineColor(const string& _item, Color _color) :
 {
 }
 
-void CommandSetLineColor::process(ExecutionEnvironment& env)
+void CommandSetLineColor::process(ExecutionEnvironment& /* env */)
 {
     if (CelxLua::LineColorMap.count(item) == 0)
     {
@@ -889,7 +890,7 @@ CommandSetLabelColor::CommandSetLabelColor(const string& _item, Color _color) :
 {
 }
 
-void CommandSetLabelColor::process(ExecutionEnvironment& env)
+void CommandSetLabelColor::process(ExecutionEnvironment& /* env */)
 {
     if (CelxLua::LabelColorMap.count(item) == 0)
     {

src/celengine/console.cpp

@@ -7,6 +7,7 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
+#include <cstring>
 #include <cstdarg>
 #include <cstdio>
 #include <cassert>

src/celengine/fragmentprog.cpp

@@ -10,6 +10,7 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <celutil/util.h>
 #include "gl.h"
 #include "glext.h"
 #include "fragmentprog.h"

src/celengine/galaxy.cpp

@@ -7,6 +7,7 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
+#include <cstring>
 #include <fstream>
 #include <algorithm>
 #include <cstdio>

src/celengine/overlay.cpp

@@ -7,6 +7,7 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
+#include <cstring>
 #include <cstdarg>
 #include <cstdio>
 #include <celutil/utf8.h>

src/celengine/stardb.cpp

@@ -7,6 +7,7 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
+#include <cstring>
 #include <cmath>
 #include <cstdlib>
 #include <cstdio>

src/celestia/celx_object.cpp

@@ -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 "celx.h"
 #include "celx_internal.h"
 #include "celx_object.h"

src/celestia/eclipsefinder.cpp

@@ -10,7 +10,7 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
-#include <string>
+#include <cstring>
 #include <sstream>
 #include <algorithm>
 #include <set>

src/celestia/kde/celestialbrowser.cpp

@@ -1,3 +1,4 @@
+#include <libintl.h>
 #include <qradiobutton.h>
 #include <klistview.h>
 #include <kpopupmenu.h>

src/celestia/kde/eclipsefinderdlg.cpp

@@ -1,3 +1,4 @@
+#include <libintl.h>
 #include <klocale.h>
 #include <qstatusbar.h>
 #include <qdatetime.h>

src/celestia/kde/kdeapp.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 
+#include <libintl.h>
 #include <fstream>
 #include <sstream>
 

src/celestia/kde/kdeuniquecelestia.cpp

@@ -21,6 +21,7 @@
 #include <string>
 #include <vector>
 #include <klocale.h>
+#include <libintl.h>
 
 KdeUniqueCelestia::KdeUniqueCelestia() {
 

src/celestia/kde/selectionpopup.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 
+#include <libintl.h>
 #include <sstream>
 #include <fstream>
 #include <algorithm>

src/celestia/oggtheoracapture.cpp

@@ -66,6 +66,7 @@
 #include <celutil/util.h>
 #include "../celengine/gl.h"
 #include <string>
+#include <cstring>
 #include "theora/theora.h"
 
 using namespace std;
@@ -159,7 +160,12 @@ bool OggTheoraCapture::start(const std::string& filename,
         return false;
     }
     /* Set up Ogg output stream */
-    std::srand(std::time(NULL));
+#ifdef _WIN32
+	std::srand(std::time(NULL));
+#else
+	std::srand(time(NULL));
+#endif
+
     ogg_stream_init(&to,std::rand());
 
     frame_x = w;

src/celestia/url.cpp

@@ -16,10 +16,12 @@
  ***************************************************************************/
 
 #include <string>
+#include <cstring>
 #include <cstdio>
 #include <cassert>
 #include <sstream>
 #include "celestiacore.h"
+#include "celutil/util.h"
 #include "celengine/astro.h"
 #include "url.h"
 

src/celutil/formatnum.cpp

@@ -9,7 +9,8 @@
 
 #include <cmath>
 #include <cstdio>
-#include <string>
+#include <cstring>
+#include <climits>
 #include "formatnum.h"
 
 // HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf

src/celutil/utf8.cpp

@@ -9,6 +9,7 @@
 
 #include "utf8.h"
 #include <cctype>
+#include <cstring>
 #include "util.h"
 
 unsigned int WGL4_Normalization_00[256] = {

src/celutil/util.h

@@ -9,8 +9,8 @@
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef _CELUTIL_UTIL_H_
+#define _CELUTIL_UTIL_H_
 
 #include <string>
 #include <vector>
@@ -28,12 +28,20 @@
 // to prevent namespace pollution by the Windows macros.
 #define NOMINMAX
 #endif
-				      
+
+// gettext / libintl setup
+#define _(string) gettext (string)
+
 #ifdef _WIN32
+
 #include "libintl.h"
-#define _(string) gettext (string)
+
 #else
-#define _(string) gettext (string)
+
+#ifndef TARGET_OS_MAC
+#include <libintl.h>
+#endif /* TARGET_OS_MAC */
+
 #endif
 
 extern int compareIgnoringCase(const std::string& s1, const std::string& s2);
@@ -60,4 +68,4 @@ template <class T> struct deleteFunc : public std::unary_function<T, void>
     int dummy;
 };
 
-#endif // _UTIL_H_
+#endif // _CELUTIL_UTIL_H_