backward compatibility with libconsole-bridge in Jessie (take 2)

ros · Nov 7, 2017 · 3e3712e · 3e3712e
1 parent 031279f
commit 3e3712e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/tools/rosbag_storage/include/rosbag/bag.h b/tools/rosbag_storage/include/rosbag/bag.h
@@ -62,7 +62,13 @@
 
 #include "console_bridge/console.h"
 #if defined logDebug
-# undef logDebug
+# ifdef CONSOLE_BRIDGE_logDebug
+#  undef logDebug
+# else
+// Remove this when no longer supporting platforms with libconsole-bridge-dev < 0.3.0,
+// in particular Debian Jessie: https://packages.debian.org/jessie/libconsole-bridge-dev
+#  define CONSOLE_BRIDGE_logDebug logDebug
+# endif
 #endif
 #if defined logInform
 # undef logInform
@@ -71,13 +77,13 @@
 # undef logWarn
 #endif
 #if defined logError
-# undef logError
-#endif
-
+# ifdef CONSOLE_BRIDGE_logError
+#  undef logError
+# else
 // Remove this when no longer supporting platforms with libconsole-bridge-dev < 0.3.0,
 // in particular Debian Jessie: https://packages.debian.org/jessie/libconsole-bridge-dev
-#ifndef CONSOLE_BRIDGE_logDebug
-  #define CONSOLE_BRIDGE_logDebug logDebug
+#  define CONSOLE_BRIDGE_logError logError
+# endif
 #endif
 
 namespace rosbag {

diff --git a/tools/rosbag_storage/src/bag.cpp b/tools/rosbag_storage/src/bag.cpp
@@ -43,12 +43,6 @@
 
 #include "console_bridge/console.h"
 
-// Remove this when no longer supporting platforms with libconsole-bridge-dev < 0.3.0,
-// in particular Debian Jessie: https://packages.debian.org/jessie/libconsole-bridge-dev
-#ifndef CONSOLE_BRIDGE_logError
-  #define CONSOLE_BRIDGE_logError logError
-#endif
-
 #define foreach BOOST_FOREACH
 
 using std::map;