proxmox-mirrors/mirror_smartmontools-debian
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_smartmontools-debian synced 2025-08-08 17:45:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debian/patches/65_freebsd.patch: The os_freebsd.cpp uses reallocf(), which is specific for *BSD libc. Added an implementation directly into os_freebsd.cpp

Browse Source 
Thanks: Petr Salinger
This commit is contained in:
Giuseppe Iuculano 2009-09-07 16:26:09 +02:00
parent e6db3d5848
commit af11f9b144
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
debian/patches/65_freebsd.patch vendored
View File

@ -1,7 +1,22 @@
Fixed FTBFS on GNU/kFreeBSD Fixed FTBFS on GNU/kFreeBSD
--- a/os_freebsd.cpp --- a/os_freebsd.cpp
+++ b/os_freebsd.cpp +++ b/os_freebsd.cpp
@@ -759,7 +759,7 @@ int freebsd_ata_device::ata_command_inte @@ -79,6 +79,14 @@ struct freebsd_dev_channel *devicetable[
// forward declaration
// static int parse_ata_chan_dev(const char * dev_name, struct freebsd_dev_channel *ch);
+#ifdef __GLIBC__
+static inline void * reallocf(void *ptr, size_t size) {
+ void *rv = realloc(ptr, size);
+ if(rv == NULL)
+ free(ptr);
+ return rv;
+ }
+#endif
// Returns 1 if device not available/open/found else 0. Also shifts fd into valid range.
static int isnotopen(int *fd, struct freebsd_dev_channel** fdchan) {
@@ -759,7 +767,7 @@ int freebsd_ata_device::ata_command_inte
#endif #endif
return -1; return -1;
@ -10,7 +25,7 @@ Fixed FTBFS on GNU/kFreeBSD
printwarning(NO_RETURN,NULL); printwarning(NO_RETURN,NULL);
#endif #endif
@@ -1369,7 +1369,7 @@ int do_normal_scsi_cmnd_io(int fd, struc @@ -1369,7 +1377,7 @@ int do_normal_scsi_cmnd_io(int fd, struc
if (cam_send_ccb(cam_dev,ccb) < 0) { if (cam_send_ccb(cam_dev,ccb) < 0) {
warn("error sending SCSI ccb"); warn("error sending SCSI ccb");
@ -19,7 +34,7 @@ Fixed FTBFS on GNU/kFreeBSD
cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr); cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
#endif #endif
cam_freeccb(ccb); cam_freeccb(ccb);
@@ -1377,7 +1377,7 @@ int do_normal_scsi_cmnd_io(int fd, struc @@ -1377,7 +1385,7 @@ int do_normal_scsi_cmnd_io(int fd, struc
} }
if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
@ -28,3 +43,16 @@ Fixed FTBFS on GNU/kFreeBSD
cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr); cam_error_print(cam_dev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
#endif #endif
cam_freeccb(ccb); cam_freeccb(ccb);
--- a/cciss.cpp
+++ b/cciss.cpp
@@ -19,6 +19,10 @@
# 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