[Kstars-devel] kdeedu/kstars/kstars/indi/webcam
Jason Harris
kstars at 30doradus.org
Fri Aug 27 21:29:11 CEST 2004
CVS commit by harris:
Fix compilation on PPC and Sun/Sparc (latter is bug #88100). Thanks to
George Wright for pointing out the PPC error, and testing the fix.
Backporting to 3_3_BRANCH.
CCMAIL: 88100-done at bugs.kde.org
CCMAIL: kstars-devel at kde.org
CCMAIL: gwright at kde.org
M +3 -3 port.cpp 1.4
M +3 -3 port.h 1.4
--- kdeedu/kstars/kstars/indi/webcam/port.cpp #1.3:1.4
@@ -39,5 +39,5 @@
#ifdef __linux__
- #if defined(arm) || defined(__hppa__)
+ #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
#include <fcntl.h>
#else
@@ -75,5 +75,5 @@ port_t::port_t(int iport) {
#ifdef LINUX
-#if defined(arm) || defined(__hppa__)
+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
if ((devport = open("/dev/port", O_RDWR)) < 0) {
perror("open /dev/port");
@@ -119,5 +119,5 @@ port_t::~port_t(void) {
#endif /* LOCKING */
#ifdef LINUX
-#if defined(arm) || defined(__hppa__)
+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
if (devport >= 0)
close(devport);
--- kdeedu/kstars/kstars/indi/webcam/port.h #1.3:1.4
@@ -36,5 +36,5 @@
#ifdef __linux__
- #if !defined(arm) && !defined(__hppa__)
+ #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__)
#include <sys/io.h>
#endif /* !arm */
@@ -56,5 +56,5 @@
#endif
-#if defined(arm) || defined(__hppa__)
+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
static char ports_temp;
@@ -115,5 +115,5 @@ private:
FILE *devio;
#endif
-#if defined(__linux__) && (defined(arm) || defined(__hppa__))
+#if defined(__linux__) && (defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__))
int devport;
#endif
More information about the Kstars-devel
mailing list