From cbcae473ad2ce8cb4ab7faac08b2a0ee682bc64d Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 6 Oct 2011 10:59:25 +0000 Subject: [PATCH] Now unconditional: Cdrskin_libburn_has_burn_msgS --- cdrskin/cdrskin.c | 10 +--------- cdrskin/cdrskin_timestamp.h | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cdrskin/cdrskin.c b/cdrskin/cdrskin.c index d3b06e9..14545e0 100644 --- a/cdrskin/cdrskin.c +++ b/cdrskin/cdrskin.c @@ -184,7 +184,7 @@ or #define Cdrskin_libburn_has_is_enumerablE 1 #define Cdrskin_libburn_has_convert_fs_adR 1 #define Cdrskin_libburn_has_convert_scsi_adR 1 -#define Cdrskin_libburn_has_burn_msgS 1 +/* Cdrskin_libburn_has_burn_msgS */ /* Cdrskin_libburn_has_burn_aborT */ /* Cdrskin_libburn_has_cleanup_handleR */ /* Cdrskin_libburn_has_audioxtR */ @@ -2086,10 +2086,8 @@ int Cdrpreskin_set_severities(struct CdrpreskiN *preskin, char *queue_severity, strcpy(preskin->queue_severity,queue_severity); if(print_severity!=NULL) strcpy(preskin->print_severity,print_severity); -#ifdef Cdrskin_libburn_has_burn_msgS burn_msgs_set_severities(preskin->queue_severity, preskin->print_severity, "cdrskin: "); -#endif return(1); } @@ -2162,7 +2160,6 @@ LIBBURN_MISCONFIGURATION_ = 0; */ int Cdrpreskin_queue_msgs(struct CdrpreskiN *o, int flag) { -#ifdef Cdrskin_libburn_has_burn_msgS /* In cdrskin there is not much sense in queueing library messages. #ifndef Cdrskin_extra_leaN #define Cdrskin_debug_libdax_msgS 1 @@ -2221,7 +2218,6 @@ int Cdrpreskin_queue_msgs(struct CdrpreskiN *o, int flag) "cdrskin: ----------------------------------------------------------------\n"); #endif /* Cdrskin_debug_libdax_msgS */ -#endif /* Cdrskin_libburn_has_burn_msgS */ return(1); } @@ -8263,10 +8259,8 @@ int Cdrskin_create(struct CdrskiN **o, struct CdrpreskiN **preskin, printf("cdrskin: scanning for devices ...\n"); fflush(stdout); -#ifdef Cdrskin_libburn_has_burn_msgS if(skin->preskin->verbositypreskin->queue_severity, skin->preskin->print_severity, "cdrskin: "); -#endif /* This prints the eventual queued messages */ Cdrpreskin_queue_msgs(skin->preskin,0); diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 87db94b..d19bb53 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2011.10.06.104908" +#define Cdrskin_timestamP "2011.10.06.105627"