Ticket #10: 65_freebsd.2.patch

cciss.cpp

@@ -19 +19 @@
 #  include <sys/endian.h>
 #  include <dev/ciss/cissio.h>
 #  define _HAVE_CCISS
+#elif defined(__FreeBSD_kernel__) && defined(HAVE_DEV_CISS_CISSIO_H)
+#  include <endian.h>
+#  include <dev/ciss/cissio.h>
+#  define _HAVE_CCISS
 #endif
 
 #ifdef _HAVE_CCISS

os_freebsd.cpp

@@ -49 +49 @@
 
 #define USBDEV "/dev/usb"
 
-#if __FreeBSD_version >= 800000
+#if (__FreeBSD_version >= 800000) || (__FreeBSD_kernel_version >= 800000)
 #include <libusb20_desc.h>
 #include <libusb20.h>
 #else
@@ -178 +178 @@
   const char * m_mode; ///< Mode string for deviceopen().
 };
 
+#ifdef __GLIBC__
+static inline void * reallocf(void *ptr, size_t size) {
+   void *rv = realloc(ptr, size);
+   if(rv == NULL)
+     free(ptr);
+   return rv;
+   }
+#endif
 
 freebsd_smart_device::~freebsd_smart_device() throw()
 {
@@ -745 +753 @@
 #endif
   return -1;
 
-#if __FreeBSD_version < 502000
+#if (__FreeBSD_version < 502000) && (__FreeBSD_kernel_version < 502000)
   printwarning(NO_RETURN,NULL);
 #endif
 
@@ -1357 +1365 @@
 
   if (cam_send_ccb(cam_dev,ccb) < 0) {
     warn("error sending SCSI ccb");
-#if __FreeBSD_version > 500000
+#if (__FreeBSD_version > 500000) || (__FreeBSD_kernel_version > 500000)
     cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
 #endif
     cam_freeccb(ccb);
@@ -1365 +1373 @@
   }
 
   if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) {
-#if __FreeBSD_version > 500000
+#if (__FreeBSD_version > 500000) || (__FreeBSD_kernel_version > 500000)
     cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
 #endif
     cam_freeccb(ccb);
@@ -1998 +2006 @@
 }
 
 
-#if __FreeBSD_version < 800000 // without this build fail on FreeBSD 8
+#if (__FreeBSD_version < 800000) || (__FreeBSD_kernel_version < 800000) // without this build fail on FreeBSD 8
 static char done[USB_MAX_DEVICES];
 
 static int usbdevinfo(int f, int a, int rec, int busno, unsigned short & vendor_id,
@@ -2054 +2062 @@
 static int usbdevlist(int busno,unsigned short & vendor_id,
   unsigned short & product_id, unsigned short & version)
 {
-#if __FreeBSD_version >= 800000 // libusb2 interface
+#if (__FreeBSD_version >= 800000) || (__FreeBSD_kernel_version >= 800000) // libusb2 interface
   struct libusb20_device *pdev = NULL;
   struct libusb20_backend *pbe;
   uint32_t matches = 0;