From 4ae8431f968e03e467342cd6fa7e6244327940ab Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Thu, 6 Mar 2014 18:26:39 -0500 Subject: [PATCH] Bug TD-45 - TD-45 Fix preprocessor define. Signed-off-by: Paul Beckingham --- AUTHORS | 1 + ChangeLog | 1 + src/TDB2.cpp | 1 - src/commands/CmdDiagnostics.cpp | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 400e96acf..fa202af31 100644 --- a/AUTHORS +++ b/AUTHORS @@ -100,6 +100,7 @@ The following submitted code, packages or analysis, and deserve special thanks: Natanael Copa Marton Suranyi Nicolas Appriou + Jochen Sprickerhof Thanks to the following, who submitted detailed bug reports and excellent suggestions: diff --git a/ChangeLog b/ChangeLog index f4dd6b753..87cf746e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ Features Bugs - TD-42 Cannot compile taskd - GNUTLS_VERSION undefined in diag.cpp (thanks to Michele Vetturi). +- TD-45 Fix preprocessor define (thanks to Jochen Sprickerhof). - TW-1282 incorrect URLs in man task-sync (thanks to Jeremiah Marks). - #1511 sync init crashes if client certification file is empty or invalid (thanks to Marton Suranyi). diff --git a/src/TDB2.cpp b/src/TDB2.cpp index 1df1f81a2..a74ab1e4a 100644 --- a/src/TDB2.cpp +++ b/src/TDB2.cpp @@ -1080,7 +1080,6 @@ void TDB2::show_diff ( << view.render () << "\n"; } - } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp index d57a72241..5dd764fba 100644 --- a/src/commands/CmdDiagnostics.cpp +++ b/src/commands/CmdDiagnostics.cpp @@ -167,7 +167,7 @@ int CmdDiagnostics::execute (std::string& output) #ifdef HAVE_LIBGNUTLS #ifdef GNUTLS_VERSION << GNUTLS_VERSION -#elif LIBGNUTLS_VERSION +#elif defined LIBGNUTLS_VERSION << LIBGNUTLS_VERSION #endif #else