Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
celestia
celestia-1.5.1-gcc43.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File celestia-1.5.1-gcc43.patch of Package celestia
--- src/celutil/formatnum.cpp +++ src/celutil/formatnum.cpp @@ -7,6 +7,8 @@ // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. +#include <string.h> +#include <limits.h> #include <cmath> #include <cstdio> #include <string> --- ./src/celengine/console.cpp +++ ./src/celengine/console.cpp @@ -10,6 +10,7 @@ #include <cstdarg> #include <cstdio> #include <cassert> +#include <string.h> #include "celutil/utf8.h" #include "gl.h" #include "vecgl.h" --- src/celengine/image.cpp +++ src/celengine/image.cpp @@ -9,5 +9,6 @@ #include <fstream> +#include <cmath> #ifndef MACOSX #define JPEG_SUPPORT --- src/celengine/galaxy.cpp +++ src/celengine/galaxy.cpp @@ -312,8 +312,8 @@ void Galaxy::renderGalaxyEllipsoid(const GLContext& context, float discSizeInPixels = pixelSize * getRadius() / offset.length(); unsigned int nRings = (unsigned int) (discSizeInPixels / 4.0f); unsigned int nSlices = (unsigned int) (discSizeInPixels / 4.0f); - nRings = max(nRings, 100); - nSlices = max(nSlices, 100); + nRings = max(nRings, 100u); + nSlices = max(nSlices, 100u); VertexProcessor* vproc = context.getVertexProcessor(); if (vproc == NULL) --- src/celengine/overlay.cpp +++ src/celengine/overlay.cpp @@ -9,6 +9,7 @@ #include <cstdarg> #include <cstdio> +#include <cstring> #include <celutil/utf8.h> #include "gl.h" #include "vecgl.h" --- src/celengine/stardb.cpp +++ src/celengine/stardb.cpp @@ -11,6 +11,7 @@ #include <cstdlib> #include <cstdio> #include <cassert> +#include <cstring> #include <algorithm> #include <celmath/mathlib.h> #include <celmath/plane.h> --- src/celestia/eclipsefinder.cpp +++ src/celestia/eclipsefinder.cpp @@ -12,6 +12,7 @@ #include <string> #include <sstream> +#include <cstring> #include <algorithm> #include <set> #include <cassert> --- src/celestia/url.cpp +++ src/celestia/url.cpp @@ -17,6 +17,8 @@ #include <string> #include <stdio.h> +#include <cstring> + #include "celestiacore.h" #include "celengine/astro.h" #include "url.h" --- src/celutil/utf8.cpp 1.1 +++ src/celutil/utf8.cpp @@ -9,6 +9,7 @@ #include "utf8.h" #include <cctype> +#include <string.h> #include "util.h" unsigned int WGL4_Normalization_00[256] = { --- src/celutil/util.cpp 1.1 +++ src/celutil/util.cpp @@ -12,6 +12,7 @@ #include "util.h" #include <sys/types.h> #include <sys/stat.h> +#include <libintl.h> using namespace std; --- src/celutil/util.h 1.1 +++ src/celutil/util.h @@ -21,14 +21,6 @@ #define COMPILE_TIME_ASSERT(pred) \ switch(0){case 0: case pred:;} -#ifndef min -#define min(a, b) ((a) < (b) ? (a) : (b)) -#endif - -#ifndef max -#define max(a, b) ((a) < (b) ? (b) : (a)) -#endif - #ifdef _WIN32 #include "libintl.h" #define _(string) gettext (string) --- src/celengine/astro.cpp 1.1 +++ src/celengine/astro.cpp @@ -16,6 +16,7 @@ #include "celestia.h" #include "astro.h" #include <celutil/util.h> +#include <string.h> using namespace std; --- src/celengine/body.cpp 1.1 +++ src/celengine/body.cpp @@ -18,6 +18,7 @@ #include "meshmanager.h" #include "body.h" #include "frame.h" +#include <libintl.h> using namespace std; --- ./src/celengine/asterism.cpp 1.1 +++ ./src/celengine/asterism.cpp @@ -19,6 +19,7 @@ #include <celutil/debug.h> #include "parser.h" #include "asterism.h" +#include <libintl.h> using namespace std; --- ./src/celengine/dsodb.cpp 1.1 +++ ./src/celengine/dsodb.cpp @@ -28,6 +28,7 @@ #include "multitexture.h" #include "meshmanager.h" #include <celutil/debug.h> +#include <libintl.h> #include <celengine/galaxy.h> #include <celengine/opencluster.h> --- src/celengine/fragmentprog.cpp 1.1 +++ src/celengine/fragmentprog.cpp @@ -13,6 +13,7 @@ #include "gl.h" #include "glext.h" #include "fragmentprog.h" +#include <libintl.h> using namespace std; --- src/celengine/galaxy.cpp 1.1 +++ src/celengine/galaxy.cpp @@ -23,6 +23,8 @@ #include "vecgl.h" #include "render.h" #include "texture.h" +#include <string.h> +#include <libintl.h> using namespace std; --- ./src/celengine/image.cpp 1.1 +++ ./src/celengine/image.cpp @@ -66,6 +66,7 @@ #include <iostream> #include <algorithm> #include <cmath> +#include <libintl.h> using namespace std; --- ./src/celengine/location.cpp 1.1 +++ ./src/celengine/location.cpp @@ -11,6 +11,7 @@ #include <celengine/location.h> #include <celengine/body.h> #include <celutil/util.h> +#include <libintl.h> using namespace std; --- src/celengine/meshmanager.cpp 1.1 +++ src/celengine/meshmanager.cpp @@ -26,6 +26,7 @@ #include "spheremesh.h" #include "texmanager.h" #include "meshmanager.h" +#include <libintl.h> using namespace std; --- src/celengine/celestia.h 1.1 +++ src/celengine/celestia.h @@ -35,7 +35,7 @@ #endif /* TARGET_OS_MAC */ #endif /* _WIN32 */ - +#include <libintl.h> #endif // _CELESTIA_H_ --- src/celengine/vertexprog.cpp 1.1 +++ src/celengine/vertexprog.cpp @@ -14,6 +14,7 @@ #include "gl.h" #include "glext.h" #include "vertexprog.h" +#include <libintl.h> using namespace std; --- src/celengine/render.cpp +++ src/celengine/render.cpp @@ -1210,7 +1210,7 @@ static void computeOrbitSectionBoundingVolumes(Renderer::CachedOrbit& orbit) // Determine the number of trajectory samples to include in each bounding volume; typically, // the last volume will contain any leftover samples. - unsigned int nSections = max(orbit.trajectory.size() / MinSamplesPerSection, MinOrbitSections); + unsigned int nSections = max((unsigned) orbit.trajectory.size() / MinSamplesPerSection, MinOrbitSections); unsigned int samplesPerSection = orbit.trajectory.size() / nSections; if (samplesPerSection <= 1) { @@ -1230,7 +1230,7 @@ static void computeOrbitSectionBoundingVolumes(Renderer::CachedOrbit& orbit) Renderer::OrbitSection section; section.firstSample = samplesPerSection * i; - unsigned int lastSample = min(orbit.trajectory.size() - 1, section.firstSample + nSamples + 1); + unsigned int lastSample = min((unsigned) orbit.trajectory.size() - 1, section.firstSample + nSamples + 1); // Set the initial axis and origin of the capsule bounding volume; they will be adjusted // to contain all points in the trajectory. The length of the axis may change, but the
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor