Move memory debug files into nvwa directory.

8 files changed, 19 insertions, 19 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f5094e34..5bf511b92 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,18 +115,18 @@ if ENABLE_MEM_DEBUG
 dyecmd_CXXFLAGS += -DENABLE_MEM_DEBUG -DDEBUG_DUMP_LEAKS
 manaplus_CXXFLAGS += -DENABLE_MEM_DEBUG -DDEBUG_DUMP_LEAKS
 
-manaplus_SOURCES = debug/_nvwa.h \
-	      debug/c++11.h \
-	      debug/debug_new.cpp \
-	      debug/debug_new.h \
-	      debug/fast_mutex.h \
-	      debug/static_assert.h
-dyecmd_SOURCES =  debug/_nvwa.h \
-	      debug/c++11.h \
-	      debug/debug_new.cpp \
-	      debug/debug_new.h \
-	      debug/fast_mutex.h \
-	      debug/static_assert.h
+manaplus_SOURCES = debug/nvwa/_nvwa.h \
+	      debug/nvwa/c++11.h \
+	      debug/nvwa/debug_new.cpp \
+	      debug/nvwa/debug_new.h \
+	      debug/nvwa/fast_mutex.h \
+	      debug/nvwa/static_assert.h
+dyecmd_SOURCES =  debug/nvwa/_nvwa.h \
+	      debug/nvwa/c++11.h \
+	      debug/nvwa/debug_new.cpp \
+	      debug/nvwa/debug_new.h \
+	      debug/nvwa/fast_mutex.h \
+	      debug/nvwa/static_assert.h
 else
 manaplus_SOURCES =
 dyecmd_SOURCES =
diff --git a/src/debug.h b/src/debug.h
index a4feb574b..307766806 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -25,7 +25,7 @@
 #ifdef ENABLE_MEM_DEBUG
 
 // #define _DEBUG_NEW_EMULATE_MALLOC 1
-#include "debug/debug_new.h"
+#include "debug/nvwa/debug_new.h"
 
 #endif  // ENABLE_MEM_DEBUG
 
diff --git a/src/debug/_nvwa.h b/src/debug/nvwa/_nvwa.h
index 096893c59..096893c59 100644
--- a/src/debug/_nvwa.h
+++ b/src/debug/nvwa/_nvwa.h
diff --git a/src/debug/c++11.h b/src/debug/nvwa/c++11.h
index 8d8e2d8af..8d8e2d8af 100644
--- a/src/debug/c++11.h
+++ b/src/debug/nvwa/c++11.h
diff --git a/src/debug/debug_new.cpp b/src/debug/nvwa/debug_new.cpp
index 594796570..1a59353a3 100644
--- a/src/debug/debug_new.cpp
+++ b/src/debug/nvwa/debug_new.cpp
@@ -78,7 +78,7 @@ PRAGMA45(GCC diagnostic ignored "-Wcast-qual")
  * is defined to \c 0 to disable the redefinition of \c new.
  */
 #define _DEBUG_NEW_REDEFINE_NEW 0
-#include "debug/debug_new.h"
+#include "debug/nvwa/debug_new.h"
 
 #if !_FAST_MUTEX_CHECK_INITIALIZATION && !defined(_NOTHREADS)
 #error "_FAST_MUTEX_CHECK_INITIALIZATION not set: check_leaks may not work"
diff --git a/src/debug/debug_new.h b/src/debug/nvwa/debug_new.h
index 926de99de..50b168c2e 100644
--- a/src/debug/debug_new.h
+++ b/src/debug/nvwa/debug_new.h
@@ -39,8 +39,8 @@
 
 #include <new>                  // size_t/std::bad_alloc
 #include <stdio.h>              // FILE
-#include "debug/_nvwa.h"              // NVWA_NAMESPACE_*
-#include "debug/c++11.h"              // _NOEXCEPT
+#include "debug/nvwa/_nvwa.h"              // NVWA_NAMESPACE_*
+#include "debug/nvwa/c++11.h"              // _NOEXCEPT
 
 /* Special allocation/deallocation functions in the global scope */
 void* operator new(size_t size, const char* file, int line);
diff --git a/src/debug/fast_mutex.h b/src/debug/nvwa/fast_mutex.h
index 39b5fcdc2..faccc4893 100644
--- a/src/debug/fast_mutex.h
+++ b/src/debug/nvwa/fast_mutex.h
@@ -37,8 +37,8 @@
 #ifndef NVWA_FAST_MUTEX_H
 #define NVWA_FAST_MUTEX_H
 
-#include "debug/_nvwa.h"              // NVWA_NAMESPACE_*
-#include "debug/c++11.h"              // HAVE_CXX11_MUTEX
+#include "debug/nvwa/_nvwa.h"              // NVWA_NAMESPACE_*
+#include "debug/nvwa/c++11.h"              // HAVE_CXX11_MUTEX
 
 # if !defined(_NOTHREADS)
 #   if !defined(NVWA_USE_CXX11_MUTEX) && HAVE_CXX11_MUTEX != 0 && \
diff --git a/src/debug/static_assert.h b/src/debug/nvwa/static_assert.h
index 49248611d..877ef0f97 100644
--- a/src/debug/static_assert.h
+++ b/src/debug/nvwa/static_assert.h
@@ -36,7 +36,7 @@
 
 #ifndef STATIC_ASSERT
 
-#include "debug/c++11.h"
+#include "debug/nvwa/c++11.h"
 
 #if HAVE_CXX11_STATIC_ASSERT