[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/k3b/src/core/device
From:       Adrian Schroeter <adrian () suse ! de>
Date:       2003-10-13 10:12:28
[Download RAW message or body]

CVS commit by adrian: 

fix build some 64bit architectures


  M +12 -1     k3bdevice.cpp   1.27
  M +15 -10    k3bdevicemanager.cpp   1.11


--- kdeextragear-1/k3b/src/core/device/k3bdevice.cpp  #1.26:1.27
@@ -62,4 +62,15 @@ extern "C" {
 #endif /* #ifndef IDE_DISK_MAJOR */
 
+#ifndef SCSI_DISK_MAJOR
+#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
+  ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \
+  ((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR))
+#endif /* #ifndef SCSI_DISK_MAJOR */
+
+#ifndef SCSI_BLK_MAJOR
+#define SCSI_BLK_MAJOR(M) \
+  (SCSI_DISK_MAJOR(M)   \
+   || (M) == SCSI_CDROM_MAJOR)
+#endif /* #ifndef SCSI_BLK_MAJOR */
 
 

--- kdeextragear-1/k3b/src/core/device/k3bdevicemanager.cpp  #1.10:1.11
@@ -45,12 +45,7 @@
 /* Fix definitions for 2.5 kernels */
 #include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) 
-typedef unsigned long long __u64; 
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)
-typedef unsigned char u8;
-#endif
+#undef __STRICT_ANSI__
+#include <asm/types.h>
+#define __STRICT_ANSI__
 
 #include <linux/../scsi/scsi.h> /* cope with silly includes */
@@ -72,5 +67,15 @@ typedef unsigned char u8;
 #endif /* #ifndef IDE_DISK_MAJOR */
 
+#ifndef SCSI_DISK_MAJOR
+#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
+  ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \
+  ((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR))
+#endif /* #ifndef SCSI_DISK_MAJOR */
 
+#ifndef SCSI_BLK_MAJOR
+#define SCSI_BLK_MAJOR(M) \
+  (SCSI_DISK_MAJOR(M)   \
+   || (M) == SCSI_CDROM_MAJOR)
+#endif /* #ifndef SCSI_BLK_MAJOR */
 
 class K3bCdDevice::DeviceManager::Private


[prev in list] [next in list] [prev in thread] [next in thread]