Multi-line svn commit, see body.

[shibboleth/cpp-xmltooling.git] / xmltooling / util / NDC.cpp

diff --git a/xmltooling/util/NDC.cpp b/xmltooling/util/NDC.cpp
index 249cc96..ac23379 100644 (file)
--- a/xmltooling/util/NDC.cpp
+++ b/xmltooling/util/NDC.cpp
@@ -21,23 +21,28 @@
  */
 
 #include "internal.h"
+#include "logging.h"
 #include "util/NDC.h"
 
-#include <log4cpp/NDC.hh>
+#if defined(XMLTOOLING_LOG4SHIB)
+# include <log4shib/NDC.hh>
+#elif defined(XMLTOOLING_LOG4CPP)
+# include <log4cpp/NDC.hh>
+#endif
 
 using namespace xmltooling;
 
 NDC::NDC(const char* context)
 {
-    log4cpp::NDC::push(context);
+    logging::NDC::push(context);
 }
 
 NDC::NDC(const std::string& context)
 {
-    log4cpp::NDC::push(context);
+    logging::NDC::push(context);
 }
 
 NDC::~NDC()
 {
-    log4cpp::NDC::pop();
+    logging::NDC::pop();
 }