From f88c7384b68edaebda32b665a10ed8e1937bc26b Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sat, 21 Jun 2008 11:20:30 +0000
Subject: [PATCH] Clean up some includes

We no longer include Csocket.h in main.h because only few files actually need
it. (Only HTTPSock.h and Timers.h)

We also clean up some includes in Timers.h. It didn't actually include
the file it needed.

Oh and this also adds a warning to main.h if PATH_MAX is undefined. If this
happens, it is most likely a bug that needs to be addressed. (some missing
includes, I'd guess)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1099 726aef4b-f618-498e-8847-2d620e286838
---
 Client.h   | 1 +
 HTTPSock.h | 1 +
 Timers.h   | 3 +--
 main.h     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Client.h b/Client.h
index 80b6c7b1..e8bdcd13 100644
--- a/Client.h
+++ b/Client.h
@@ -9,6 +9,7 @@
 #ifndef _CLIENT_H
 #define _CLIENT_H
 
+#include "Csocket.h"
 #include "Utils.h"
 #include "main.h"
 
diff --git a/HTTPSock.h b/HTTPSock.h
index 17eec267..691ada76 100644
--- a/HTTPSock.h
+++ b/HTTPSock.h
@@ -11,6 +11,7 @@
 #ifndef _HTTPSOCK_H
 #define _HTTPSOCK_H
 
+#include "Csocket.h"
 #include "main.h"
 
 class CHTTPSock : public Csock {
diff --git a/Timers.h b/Timers.h
index 421891d5..f3be49ab 100644
--- a/Timers.h
+++ b/Timers.h
@@ -10,8 +10,7 @@
 #define _TIMERS_H
 
 #include "Client.h"
-#include "Csocket.h"
-#include "FileUtils.h"
+#include "IRCSock.h"
 #include "User.h"
 
 class CKeepNickTimer : public CCron {
diff --git a/main.h b/main.h
index 279ff28a..523e3191 100644
--- a/main.h
+++ b/main.h
@@ -64,9 +64,9 @@ using std::endl;
 
 #ifndef PATH_MAX
 #define PATH_MAX	1024
+#warning PATH_MAX is undefined
 #endif
 
 #include "String.h"
-#include "Csocket.h"
 
 #endif // !_MAIN_H