summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2005-10-10 21:00:07 +0000
committerleo2005-10-10 21:00:07 +0000
commit6540f25919e97cbb426ac16db3f1114ad61e0df8 (patch)
tree91b4e9ed871c6af6454dbe990b53291624466e1f
parent97727601bdc6d93d1576ea80a01b820cc34e3fb1 (diff)
Fixed some Linux compiler errors.
git-svn-id: http://svn.leocad.org/trunk@425 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--common/piece.cpp8
-rw-r--r--linux/system.cpp4
2 files changed, 8 insertions, 4 deletions
diff --git a/common/piece.cpp b/common/piece.cpp
index 66ce48b..6f626a3 100644
--- a/common/piece.cpp
+++ b/common/piece.cpp
@@ -617,11 +617,11 @@ void Piece::MinIntersectDist(LC_CLICKLINE* pLine)
bool PolygonIntersectsPlanes(float* p1, float* p2, float* p3, float* p4, const Vector4* Planes, int NumPlanes)
{
float* Points[4] = { p1, p2, p3, p4 };
- int Outcodes[4] = { 0, 0, 0, 0 };
+ int Outcodes[4] = { 0, 0, 0, 0 }, i;
int NumPoints = (p4 != NULL) ? 4 : 3;
// First do the Cohen-Sutherland out code test for trivial rejects/accepts.
- for (int i = 0; i < NumPoints; i++)
+ for (i = 0; i < NumPoints; i++)
{
Point3 Pt(Points[i][0], Points[i][1], Points[i][2]);
@@ -698,9 +698,9 @@ bool Piece::IntersectsVolume(const Vector4* Planes, int NumPlanes)
Matrix m(m_fRotation, m_fPosition);
// Start by testing trivial reject/accept cases.
- int Outcodes[8];
+ int Outcodes[8], i;
- for (int i = 0; i < 8; i++)
+ for (i = 0; i < 8; i++)
{
Point3 Point;
m.TransformPoint(&Point[0], &Box[i][0]);
diff --git a/linux/system.cpp b/linux/system.cpp
index dd69289..704519b 100644
--- a/linux/system.cpp
+++ b/linux/system.cpp
@@ -184,6 +184,10 @@ void SystemUpdateViewport(int new_vp, int old_vp)
ignore_commands = false;
}
+void SystemUpdateCategories(bool SearchOnly)
+{
+}
+
static void create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm)
{
int height, width, colors;