1
|
1 |
--- xplanet-1.2.0/src/libannotate/addMarkers.cpp-orig 2005-10-26 18:35:14.911131000 -0500
|
|
2 |
+++ xplanet-1.2.0/src/libannotate/addMarkers.cpp 2005-10-26 18:38:47.249466000 -0500
|
|
3 |
@@ -9,6 +9,8 @@
|
|
4 |
#include <vector>
|
|
5 |
using namespace std;
|
|
6 |
|
|
7 |
+#include <stdlib.h>
|
|
8 |
+
|
|
9 |
#include "buildPlanetMap.h"
|
|
10 |
#include "findFile.h"
|
|
11 |
#include "keywords.h"
|
|
12 |
--- xplanet-1.2.0/src/libannotate/addSatellites.cpp-orig 2005-10-26 18:36:39.574981000 -0500
|
|
13 |
+++ xplanet-1.2.0/src/libannotate/addSatellites.cpp 2005-10-26 18:39:12.986201000 -0500
|
|
14 |
@@ -8,6 +8,8 @@
|
|
15 |
#include <vector>
|
|
16 |
using namespace std;
|
|
17 |
|
|
18 |
+#include "stdio.h"
|
|
19 |
+
|
|
20 |
#include "findFile.h"
|
|
21 |
#include "keywords.h"
|
|
22 |
#include "Options.h"
|
|
23 |
--- xplanet-1.2.0/src/libdisplay/DisplayBase.cpp-orig 2005-10-26 18:37:16.384496000 -0500
|
|
24 |
+++ xplanet-1.2.0/src/libdisplay/DisplayBase.cpp 2005-10-26 18:38:21.118470000 -0500
|
|
25 |
@@ -7,6 +7,9 @@
|
|
26 |
#include <vector>
|
|
27 |
using namespace std;
|
|
28 |
|
|
29 |
+#include <stdio.h>
|
|
30 |
+#include <stdlib.h>
|
|
31 |
+
|
|
32 |
#include "body.h"
|
|
33 |
#include "findFile.h"
|
|
34 |
#include "keywords.h"
|
|
35 |
--- xplanet-1.2.0/src/libdisplay/DisplayOutput.cpp-orig 2005-10-26 18:39:33.605895000 -0500
|
|
36 |
+++ xplanet-1.2.0/src/libdisplay/DisplayOutput.cpp 2005-10-26 18:39:50.050437000 -0500
|
|
37 |
@@ -4,6 +4,8 @@
|
|
38 |
#include <sstream>
|
|
39 |
using namespace std;
|
|
40 |
|
|
41 |
+#include <stdio.h>
|
|
42 |
+
|
|
43 |
#include "keywords.h"
|
|
44 |
#include "Options.h"
|
|
45 |
#include "PlanetProperties.h"
|
|
46 |
--- xplanet-1.2.0/src/libmultiple/drawSphere.cpp-orig 2005-10-26 18:40:15.618965000 -0500
|
|
47 |
+++ xplanet-1.2.0/src/libmultiple/drawSphere.cpp 2005-10-26 18:42:56.803890000 -0500
|
|
48 |
@@ -1,3 +1,5 @@
|
|
49 |
+#include <math.h>
|
|
50 |
+
|
|
51 |
#include "Map.h"
|
|
52 |
#include "Options.h"
|
|
53 |
#include "View.h"
|
|
54 |
--- xplanet-1.2.0/src/libmultiple/drawEllipsoid.cpp-orig 2005-10-26 18:43:08.255730000 -0500
|
|
55 |
+++ xplanet-1.2.0/src/libmultiple/drawEllipsoid.cpp 2005-10-26 18:43:15.820042000 -0500
|
|
56 |
@@ -1,3 +1,4 @@
|
|
57 |
+#include <math.h>
|
|
58 |
#include "Map.h"
|
|
59 |
#include "Options.h"
|
|
60 |
#include "View.h"
|
|
61 |
--- xplanet-1.2.0/src/libprojection/ProjectionBonne.cpp-orig 2005-10-26 18:43:35.341687000 -0500
|
|
62 |
+++ xplanet-1.2.0/src/libprojection/ProjectionBonne.cpp 2005-10-26 18:43:55.002511000 -0500
|
|
63 |
@@ -13,6 +13,8 @@
|
|
64 |
#include <vector>
|
|
65 |
using namespace std;
|
|
66 |
|
|
67 |
+#include <stdio.h>
|
|
68 |
+
|
|
69 |
#include "Options.h"
|
|
70 |
#include "ProjectionBonne.h"
|
|
71 |
#include "xpUtil.h"
|
|
72 |
--- xplanet-1.2.0/src/libprojection/ProjectionGnomonic.cpp-orig 2005-10-26 18:44:04.191966000 -0500
|
|
73 |
+++ xplanet-1.2.0/src/libprojection/ProjectionGnomonic.cpp 2005-10-26 18:44:27.110656000 -0500
|
|
74 |
@@ -12,6 +12,8 @@
|
|
75 |
#include <sstream>
|
|
76 |
using namespace std;
|
|
77 |
|
|
78 |
+#include <stdio.h>
|
|
79 |
+
|
|
80 |
#include "Options.h"
|
|
81 |
#include "ProjectionGnomonic.h"
|
|
82 |
#include "xpUtil.h"
|
|
83 |
--- xplanet-1.2.0/src/libprojection/ProjectionIcosagnomonic.cpp-orig 2005-10-26 18:44:37.267879000 -0500
|
|
84 |
+++ xplanet-1.2.0/src/libprojection/ProjectionIcosagnomonic.cpp 2005-10-26 18:49:58.407269000 -0500
|
|
85 |
@@ -17,6 +17,8 @@
|
|
86 |
#include <vector>
|
|
87 |
using namespace std;
|
|
88 |
|
|
89 |
+#include <math.h>
|
|
90 |
+
|
|
91 |
#include "Options.h"
|
|
92 |
#include "ProjectionIcosagnomonic.h"
|
|
93 |
#include "xpUtil.h"
|
|
94 |
@@ -102,7 +104,19 @@ ProjectionIcosagnomonic::PointLL::sameSi
|
|
95 |
double dp1 = PointXYZ::dotP(cp, p1);
|
|
96 |
double dp2 = PointXYZ::dotP(cp, p2);
|
|
97 |
|
|
98 |
- return (signbit(dp1) == signbit(dp2) || fabs(dp1) < 1e-10);
|
|
99 |
+ /* Hack to workaround signbit not working on Solaris,
|
|
100 |
+ probably better to get the compiler working, but
|
|
101 |
+ this should work for now. This replaces:
|
|
102 |
+
|
|
103 |
+ return (signbit(dp1) == signbit(dp2) || fabs(dp1) < 1e-10);
|
|
104 |
+
|
|
105 |
+ according to the signbit manpage, it returns a non-zero
|
|
106 |
+ value if and only if the sign of the argument is negative.
|
|
107 |
+ So, with the above usage, it's true if both values are
|
|
108 |
+ negative or both are positive. I'm assuming 0 is
|
|
109 |
+ considered positive. */
|
|
110 |
+
|
|
111 |
+ return ((dp1 < 0 && dp2 < 0 || dp1 >= 0 && dp2 >= 0) || (fabs(dp1) < 1e-10));
|
|
112 |
}
|
|
113 |
|
|
114 |
bool
|
|
115 |
--- xplanet-1.2.0/src/libprojection/ProjectionMercator.cpp-orig 2005-10-26 18:50:27.063203000 -0500
|
|
116 |
+++ xplanet-1.2.0/src/libprojection/ProjectionMercator.cpp 2005-10-26 18:50:52.203630000 -0500
|
|
117 |
@@ -3,6 +3,8 @@
|
|
118 |
#include <sstream>
|
|
119 |
using namespace std;
|
|
120 |
|
|
121 |
+#include <stdio.h>
|
|
122 |
+
|
|
123 |
#include "Options.h"
|
|
124 |
#include "ProjectionMercator.h"
|
|
125 |
#include "xpUtil.h"
|
|
126 |
--- xplanet-1.2.0/src/Options.cpp-orig 2005-10-26 18:51:36.652448000 -0500
|
|
127 |
+++ xplanet-1.2.0/src/Options.cpp 2005-10-26 18:51:50.422786000 -0500
|
|
128 |
@@ -5,6 +5,7 @@
|
|
129 |
#include <sstream>
|
|
130 |
using namespace std;
|
|
131 |
|
|
132 |
+#include <stdlib.h>
|
|
133 |
#include <sys/time.h>
|
|
134 |
|
|
135 |
#include "config.h"
|
|
136 |
--- xplanet-1.2.0/src/Satellite.cpp-orig 2005-10-26 18:52:14.131864000 -0500
|
|
137 |
+++ xplanet-1.2.0/src/Satellite.cpp 2005-10-26 18:52:28.383425000 -0500
|
|
138 |
@@ -3,6 +3,7 @@
|
|
139 |
#include <iostream>
|
|
140 |
using namespace std;
|
|
141 |
|
|
142 |
+#include <stdio.h>
|
|
143 |
#include <sys/time.h>
|
|
144 |
|
|
145 |
#include "xpUtil.h"
|
|
146 |
--- xplanet-1.2.0/src/drawMultipleBodies.cpp-orig 2005-10-26 18:52:39.697423000 -0500
|
|
147 |
+++ xplanet-1.2.0/src/drawMultipleBodies.cpp 2005-10-26 18:52:53.496485000 -0500
|
|
148 |
@@ -7,6 +7,8 @@
|
|
149 |
#include <vector>
|
|
150 |
using namespace std;
|
|
151 |
|
|
152 |
+#include <stdio.h>
|
|
153 |
+
|
|
154 |
#include "body.h"
|
|
155 |
#include "buildPlanetMap.h"
|
|
156 |
#include "config.h"
|
|
157 |
--- xplanet-1.2.0/src/parse.cpp-orig 2005-10-26 18:53:01.666309000 -0500
|
|
158 |
+++ xplanet-1.2.0/src/parse.cpp 2005-10-26 18:53:11.989312000 -0500
|
|
159 |
@@ -4,6 +4,8 @@
|
|
160 |
#include <string>
|
|
161 |
using namespace std;
|
|
162 |
|
|
163 |
+#include <stdio.h>
|
|
164 |
+
|
|
165 |
#include "keywords.h"
|
|
166 |
#include "parseColor.h"
|
|
167 |
#include "xpUtil.h"
|
|
168 |
--- xplanet-1.2.0/src/xpUtil.cpp-orig 2005-10-26 18:54:51.292117000 -0500
|
|
169 |
+++ xplanet-1.2.0/src/xpUtil.cpp 2005-10-26 18:55:13.171041000 -0500
|
|
170 |
@@ -8,6 +8,8 @@
|
|
171 |
#include <string>
|
|
172 |
using namespace std;
|
|
173 |
|
|
174 |
+#include <stdlib.h>
|
|
175 |
+#include <stdio.h>
|
|
176 |
#include <unistd.h>
|
|
177 |
extern char **environ;
|
|
178 |
|
|
179 |
--- xplanet-1.2.0/src/libprojection/getProjection.cpp-orig 2005-10-26 19:09:44.958907000 -0500
|
|
180 |
+++ xplanet-1.2.0/src/libprojection/getProjection.cpp 2005-10-26 19:09:51.316593000 -0500
|
|
181 |
@@ -4,6 +4,8 @@
|
|
182 |
#include <vector>
|
|
183 |
using namespace std;
|
|
184 |
|
|
185 |
+#include <stdlib.h>
|
|
186 |
+
|
|
187 |
#include "keywords.h"
|
|
188 |
#include "xpUtil.h"
|
|
189 |
|