--- a/src/core/model/log.cc	Mon Apr 11 15:19:44 2011 +0200
+++ b/src/core/model/log.cc	Mon Apr 11 15:38:09 2011 +0200
@@ -19,8 +19,6 @@
  */
 #include "log.h"
 
-#ifdef NS3_LOG_ENABLE
-
 #include <list>
 #include <utility>
 #include <iostream>
@@ -381,35 +379,3 @@
 {}
 
 } // namespace ns3
-
-#else // NS3_LOG_ENABLE
-
-namespace ns3 {
-
-void 
-LogComponentEnable (char const *name, enum LogLevel level)
-{
-
-}
-
-void 
-LogComponentEnableAll (enum LogLevel level)
-{
-
-}
-
-void 
-LogComponentDisable (char const *name, enum LogLevel level)
-{
-
-}
-
-void 
-LogComponentDisableAll (enum LogLevel level)
-{
-
-}
-
-} // namespace ns3
-
-#endif

--- a/src/core/model/log.h	Mon Apr 11 15:19:44 2011 +0200
+++ b/src/core/model/log.h	Mon Apr 11 15:38:09 2011 +0200
@@ -323,9 +323,23 @@
     }                                   \
   while (false)
 
+#else /* LOG_ENABLE */
+
+#define NS_LOG_COMPONENT_DEFINE(component)
+#define NS_LOG(level, msg)
+#define NS_LOG_ERROR(msg)
+#define NS_LOG_WARN(msg)
+#define NS_LOG_DEBUG(msg)
+#define NS_LOG_INFO(msg)
+#define NS_LOG_FUNCTION_NOARGS()
+#define NS_LOG_FUNCTION(msg)
+#define NS_LOG_LOGIC(msg)
+#define NS_LOG_UNCOND(msg)
+
+#endif /* LOG_ENABLE */
+
 namespace ns3 {
 
-
 /**
  * \ingroup logging
  *
@@ -385,27 +399,5 @@
 
 } // namespace ns3
 
-#else /* LOG_ENABLE */
-
-#define NS_LOG_COMPONENT_DEFINE(component)
-#define NS_LOG(level, msg)
-#define NS_LOG_ERROR(msg)
-#define NS_LOG_WARN(msg)
-#define NS_LOG_DEBUG(msg)
-#define NS_LOG_INFO(msg)
-#define NS_LOG_FUNCTION_NOARGS()
-#define NS_LOG_FUNCTION(msg)
-#define NS_LOG_LOGIC(msg)
-#define NS_LOG_UNCOND(msg)
-
-#define LogComponentPrintList
-#define LogRegisterTimePrinter(printer)
-
-#define LogSetTimePrinter(printer)
-#define LogGetTimePrinter
-#define LogSetNodePrinter(printer)
-#define LogGetNodePrinter
-
-#endif /* LOG_ENABLE */
 
 #endif // __LOG_H__