Changeset 37774 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 4, 2011 9:19:27 PM (14 years ago)

Author:

vboxsync

Message:

Build fixes for current FreeBSD 9 (Thanks to Bernhard Froehlich and Jung-uk Kim)

File:

• trunk/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp

@@ -36 +36 @@
 
 #ifdef RT_OS_FREEBSD
+# include <sys/param.h>
 # include <sys/types.h>
 # include <sys/stat.h>
@@ -187 +188 @@
         DeviceMatchPattern.pattern.device_pattern.target_lun = CAM_LUN_WILDCARD;
         DeviceMatchPattern.pattern.device_pattern.flags      = DEV_MATCH_INQUIRY;
-        DeviceMatchPattern.pattern.device_pattern.inq_pat.type = T_CDROM;
-        DeviceMatchPattern.pattern.device_pattern.inq_pat.media_type  = SIP_MEDIA_REMOVABLE | SIP_MEDIA_FIXED;
-        DeviceMatchPattern.pattern.device_pattern.inq_pat.vendor[0]   = '*'; /* Matches anything */
-        DeviceMatchPattern.pattern.device_pattern.inq_pat.product[0]  = '*'; /* Matches anything */
-        DeviceMatchPattern.pattern.device_pattern.inq_pat.revision[0] = '*'; /* Matches anything */
+
+#if __FreeBSD_version >= 900000
+# define INQ_PAT data.inq_pat
+#else
+ #define INQ_PAT inq_pat
+#endif
+        DeviceMatchPattern.pattern.device_pattern.INQ_PAT.type = T_CDROM;
+        DeviceMatchPattern.pattern.device_pattern.INQ_PAT.media_type  = SIP_MEDIA_REMOVABLE | SIP_MEDIA_FIXED;
+        DeviceMatchPattern.pattern.device_pattern.INQ_PAT.vendor[0]   = '*'; /* Matches anything */
+        DeviceMatchPattern.pattern.device_pattern.INQ_PAT.product[0]  = '*'; /* Matches anything */
+        DeviceMatchPattern.pattern.device_pattern.INQ_PAT.revision[0] = '*'; /* Matches anything */
+#undef INQ_PAT
         DeviceCCB.cdm.num_patterns    = 1;
         DeviceCCB.cdm.pattern_buf_len = sizeof(struct dev_match_result);