From 2dd7559045c03016ac9c17c8f26b05c26b57e717 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 6 Oct 2011 12:13:46 +0000
Subject: [PATCH] Now unconditional: Cdrskin_libburn_from_pykix_svN

---
 libburn/trunk/cdrskin/cdrskin.c           | 12 ++++--------
 libburn/trunk/cdrskin/cdrskin_timestamp.h |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libburn/trunk/cdrskin/cdrskin.c b/libburn/trunk/cdrskin/cdrskin.c
index ccc3e3fe..6ee04d31 100644
--- a/libburn/trunk/cdrskin/cdrskin.c
+++ b/libburn/trunk/cdrskin/cdrskin.c
@@ -122,18 +122,15 @@ or
 
 #ifdef Cdrskin_libburn_1_1_6
 #define Cdrskin_libburn_versioN "1.1.6"
-#define Cdrskin_libburn_from_pykix_svN 1
 #endif
 
 #ifdef Cdrskin_libburn_1_1_7
 #define Cdrskin_libburn_versioN "1.1.7"
-#define Cdrskin_libburn_from_pykix_svN 1
 #endif
 
 #ifndef Cdrskin_libburn_versioN
 #define Cdrskin_libburn_1_1_6
 #define Cdrskin_libburn_versioN "1.1.6"
-#define Cdrskin_libburn_from_pykix_svN 1
 #endif
 
 #ifdef Cdrskin_libburn_1_1_6
@@ -154,8 +151,10 @@ or
 #endif
 
 
-
-#ifdef Cdrskin_libburn_from_pykix_svN
+/* History of development macros.
+   As of version 1.1.8 they are now unconditional, thus removing the option
+   to compile a heavily restricted cdrskin for the old libburn at icculus.org.
+*/
 
 /* 0.2.2 */
 /* Cdrskin_libburn_does_ejecT */
@@ -250,9 +249,6 @@ or
 #endif /* Cdrskin_new_api_tesT */
 
 
-#endif /* Cdrskin_libburn_from_pykix_svN */
-
-
 /** ts A90901
     The raw write modes of libburn depend in part on code borrowed from cdrdao.
     Since this code is not understood by the current developers and since CDs
diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h
index 95ac7a07..4126b4ad 100644
--- a/libburn/trunk/cdrskin/cdrskin_timestamp.h
+++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2011.10.06.120014"
+#define Cdrskin_timestamP "2011.10.06.121140"