fix build with clang6; from Matthew Martin

This commit is contained in:
jasper 2018-04-10 06:32:41 +00:00
parent c098f652f3
commit 81d7f22063
2 changed files with 36 additions and 3 deletions

View File

@ -1,6 +1,16 @@
$OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.5 2011/07/09 01:41:13 ajacoutot Exp $
--- src/celestia/celestiacore.cpp.orig Sun Jun 5 18:11:13 2011
+++ src/celestia/celestiacore.cpp Sat Jul 9 03:23:48 2011
$OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.6 2018/04/10 06:32:41 jasper Exp $
Index: src/celestia/celestiacore.cpp
--- src/celestia/celestiacore.cpp.orig
+++ src/celestia/celestiacore.cpp
@@ -439,7 +439,7 @@ void CelestiaCore::activateFavorite(FavoritesEntry& fa
sim->setTime(fav.jd);
sim->setObserverPosition(fav.position);
sim->setObserverOrientation(fav.orientation);
- if (fav.fov != NULL)
+ if (fav.fov != 0)
{
sim->getActiveObserver()->setFOV(fav.fov);
setZoomFromFOV();
@@ -4103,7 +4103,7 @@ bool CelestiaCore::initSimulation(const string* config
}
else

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_celestia_favorites_cpp,v 1.1 2018/04/10 06:32:41 jasper Exp $
Index: src/celestia/favorites.cpp
--- src/celestia/favorites.cpp.orig
+++ src/celestia/favorites.cpp
@@ -80,7 +80,7 @@ FavoritesList* ReadFavoritesList(istream& in)
// Get fov
if (!favParams->getNumber("fov", fav->fov))
- fav->fov = NULL;
+ fav->fov = 0;
// Get time
fav->jd = 0.0;
@@ -137,7 +137,7 @@ void WriteFavoritesList(FavoritesList& favorites, ostr
out << "\tangle " << angle << '\n';
out << setprecision(16);
out << "\ttime " << fav->jd << '\n';
- if (fav->fov != NULL)
+ if (fav->fov != 0)
out << "\tfov " << fav->fov << '\n';
out << "\tselection \"" << fav->selectionName << "\"\n";
out << "\tcoordsys \"";