r10680: changes for fedora 4

diff --git a/ChangeLog b/ChangeLog
index e0434c83abb49cad7f6750960b4fd8422100b657..5031ea7ee2a663258cac010b0771762ed5fd73d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Aug 22, 2005  Version 4.4.1
+        * work-around for compilation problems on Fedora 4 and wxWin 2.4.2
+       
 Aug 22, 2005  Version 4.4.0
         * Changes in configure.ac for X.org compatibility with Debian Etch
        and FC4. May not be backward compatibility with XFree86.

diff --git a/debian/changelog b/debian/changelog
index 0b57147fbe1435365de98f2ab871fe80d4c53b44..1b5b61fb12bb26c34254b0053adb22d7a64429a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ctsim (4.4.1-1) unstable; urgency=low
+
+  * New upstream (minor compilation fix for FC4)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 31 Aug 2005 04:21:55 +0000
+
 ctsim (4.4.0-2) unstable; urgency=low
 
   * Track wxwin2.4 package name change to wx2.4-headers

diff --git a/include/timer.h b/include/timer.h
index b536a58f23928650f1c6eb0843689a118c9507a3..dd88d7bf4a7d5c4d8b7929ba9dfcfca1bf9b0a9b 100644 (file)
--- a/include/timer.h
+++ b/include/timer.h
@@ -28,6 +28,10 @@
 #ifndef _TIMER_H
 #define _TIMER_H
 
+// pragma line required for Fedora 4 and wxWin 2.4.2 
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "timer.h"
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp
index e26360cfa9ee9e9ebe0f46770f282e8e5bb609f2..f9b328f848248bd20b362512dc05f15b388cd53e 100644 (file)
--- a/src/backgroundsupr.cpp
+++ b/src/backgroundsupr.cpp
@@ -31,6 +31,9 @@
 #include "wx/wx.h"
 #endif
 
+// pragma line required for Fedora 4 and wxWin 2.4.2 
+#pragma implementation "timer.h"
+
 #include "ct.h"
 #include "ctsim.h"
 #include "docs.h"