From 12ab1d49daa87a4cdeb9ca8c719edbb25fe3cc25 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 14 Sep 2008 17:45:11 +0000 Subject: [PATCH] Gave up problematic and unused version.h --- libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/libburn/util.c | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 37afdf8f..d4a1f989 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2008.09.09.131915" +#define Cdrskin_timestamP "2008.09.14.174344" diff --git a/libburn/trunk/libburn/util.c b/libburn/trunk/libburn/util.c index 7ace0b32..11f4abb1 100644 --- a/libburn/trunk/libburn/util.c +++ b/libburn/trunk/libburn/util.c @@ -4,7 +4,11 @@ /* #include */ #include -#include "version.h" + +/* ts A80914 : This is unneeded. Version info comes from libburn.h. +#include "v ersion.h" +*/ + #include "util.h" #include "libburn.h" @@ -48,13 +52,7 @@ char *burn_strndup(char *s, int n) void burn_version(int *major, int *minor, int *micro) { /* ts A80408 : switched from configure.ac versioning to libburn.h versioning */ -#ifdef burn_header_version_major - *major = burn_header_version_major; - *minor = burn_header_version_minor; - *micro = burn_header_version_micro; -#else - *major = BURN_MAJOR_VERSION; - *minor = BURN_MINOR_VERSION; - *micro = BURN_MICRO_VERSION; -#endif + *major = burn_header_version_major; + *minor = burn_header_version_minor; + *micro = burn_header_version_micro; }