[Kstars-devel] kdeedu/kstars/kstars/indi/webcam

[Jason Harris]

CVS commit by harris: 

Fixing bug #91721.  Preprocessor checks for the S390 architecture were 
missing.  Thanks for the report.

BUG: 91721
CCMAIL: kstars-devel at kde.org


  M +3 -3      port.cpp   1.5
  M +3 -3      port.h   1.5


--- kdeedu/kstars/kstars/indi/webcam/port.cpp  #1.4:1.5
@@ -39,5 +39,5 @@
 
 #ifdef __linux__
-  #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
+  #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)
   #include <fcntl.h>
   #else
@@ -75,5 +75,5 @@ port_t::port_t(int iport) {
 
 #ifdef LINUX
-#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)
   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__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)
   if (devport >= 0)
     close(devport);

--- kdeedu/kstars/kstars/indi/webcam/port.h  #1.4:1.5
@@ -36,5 +36,5 @@
 
 #ifdef __linux__
-  #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__)
+  #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__)
   #include <sys/io.h>
   #endif /* !arm */
@@ -56,5 +56,5 @@
 #endif
 
-#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)
 static char ports_temp;
 
@@ -115,5 +115,5 @@ private:
   FILE *devio;
 #endif
-#if defined(__linux__) && (defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__))
+#if defined(__linux__) && (defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__))
   int devport;
 #endif