From 362f3009ac9a8fc7e1cedea66aa72abcdf52d934 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Fri, 5 Apr 2013 16:39:40 +0100
Subject: Merge inspircd_{config,version}.h into a single header file.

---
 include/inspircd.h                         | 3 +--
 include/inspstring.h                       | 4 ++--
 include/socketengine.h                     | 2 +-
 include/threadengine.h                     | 2 +-
 include/threadengines/threadengine_win32.h | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/inspircd.h b/include/inspircd.h
index 2e1cfbd21..1ca3d077b 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -81,8 +81,7 @@
 #include <bitset>
 #include <set>
 #include <time.h>
-#include "inspircd_config.h"
-#include "inspircd_version.h"
+#include "config.h"
 #include "typedefs.h"
 #include "consolecolors.h"
 
diff --git a/include/inspstring.h b/include/inspstring.h
index a6ef5e552..494ce92b1 100644
--- a/include/inspstring.h
+++ b/include/inspstring.h
@@ -21,8 +21,8 @@
 #ifndef INSPSTRING_H
 #define INSPSTRING_H
 
-// This (inspircd_config) is needed as inspstring doesn't pull in the central header
-#include "inspircd_config.h"
+// This (config) is needed as inspstring doesn't pull in the central header
+#include "config.h"
 #include <cstring>
 //#include <cstddef>
 
diff --git a/include/socketengine.h b/include/socketengine.h
index 643bceee5..58af73589 100644
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include <string>
 #include <map>
-#include "inspircd_config.h"
+#include "config.h"
 #include "socket.h"
 #include "base.h"
 
diff --git a/include/threadengine.h b/include/threadengine.h
index 4bf5a48f3..e0ed9ec40 100644
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -24,7 +24,7 @@
 #include <vector>
 #include <string>
 #include <map>
-#include "inspircd_config.h"
+#include "config.h"
 #include "base.h"
 
 class ThreadData;
diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index f068ac707..2fdcac565 100644
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -21,7 +21,7 @@
 #ifndef THREADENGINE_WIN32_H
 #define THREADENGINE_WIN32_H
 
-#include "inspircd_config.h"
+#include "config.h"
 #include "base.h"
 
 class Thread;
-- 
cgit v1.3.1-10-gc9f91