From 13255f01b4cc3cdbb52a02d31f8c68a0444fc906 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 6 Oct 2011 09:02:53 +0000
Subject: [PATCH] Now unconditional: Cdrskin_libburn_preset_device_familY

---
 libburn/trunk/cdrskin/cdrskin.c           | 7 ++-----
 libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libburn/trunk/cdrskin/cdrskin.c b/libburn/trunk/cdrskin/cdrskin.c
index 7eb15163..97d3be44 100644
--- a/libburn/trunk/cdrskin/cdrskin.c
+++ b/libburn/trunk/cdrskin/cdrskin.c
@@ -219,7 +219,7 @@ or
 #define Cdrskin_libburn_has_set_forcE 1
 
 /* 0.3.6 */
-#define Cdrskin_libburn_preset_device_familY 1
+/* Cdrskin_libburn_preset_device_familY */
 /* Cdrskin_libburn_has_track_set_sizE */
 
 /* 0.3.8 */
@@ -3188,11 +3188,8 @@ final_checks:;
 
 #ifndef Cdrskin_libburn_no_burn_preset_device_opeN
  burn_preset_device_open(o->drive_exclusive
-#ifdef Cdrskin_libburn_preset_device_familY
                          | (o->drive_scsi_dev_family<<2)
-                         | ((!!o->drive_fcntl_f_setlk)<<5)
-#endif
-                         ,
+                         | ((!!o->drive_fcntl_f_setlk)<<5),
                          o->drive_blocking,
                          o->abort_on_busy_drive);
 #endif /* ! Cdrskin_libburn_no_burn_preset_device_opeN */
diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h
index 4be2f545..aef208e8 100644
--- a/libburn/trunk/cdrskin/cdrskin_timestamp.h
+++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2011.10.06.085848"
+#define Cdrskin_timestamP "2011.10.06.090207"