diff options
| author |  Attila Molnar | 2013-04-05 14:14:50 -0700 |
|---|---|---|
| committer | Attila Molnar | 2013-04-05 14:14:50 -0700 |
| commit | 7348bf71fa984ba110fd9ff3897538aa3d3abfb4 (patch) | |
| tree | 17507badedfb1811507d1ac840a9464d9974eab3 /src | |
| parent | Merge pull request #465 from Shawn-Smith/master+ServicesOperGrammar (diff) | |
| parent | Merge inspircd_{config,version}.h into a single header file. (diff) | |
| download | inspircd++-7348bf71fa984ba110fd9ff3897538aa3d3abfb4.tar.gz inspircd++-7348bf71fa984ba110fd9ff3897538aa3d3abfb4.tar.bz2 inspircd++-7348bf71fa984ba110fd9ff3897538aa3d3abfb4.zip | |
Merge pull request #472 from SaberUK/master+merge-headers
Merge inspircd_{config,version}.h into a single header file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/inspircd.cpp | 1 | ||||
| -rw-r--r-- | src/server.cpp | 1 | ||||
| -rw-r--r-- | src/socketengines/socketengine_poll.cpp | 5 | ||||
| -rw-r--r-- | src/socketengines/socketengine_ports.cpp | 1 | ||||
| -rw-r--r-- | src/socketengines/socketengine_select.cpp | 2 |
5 files changed, 1 insertions, 9 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index c34908378..cccf3fe89 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -28,7 +28,6 @@ /* $Core */ #include "inspircd.h" -#include "inspircd_version.h" #include <signal.h> #ifndef _WIN32 diff --git a/src/server.cpp b/src/server.cpp index 691ab3842..6a4603440 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -23,7 +23,6 @@ #include <signal.h> #include "exitcodes.h" #include "inspircd.h" -#include "inspircd_version.h" void InspIRCd::SignalHandler(int signal) { diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp index 5c361a0cb..7d2f4d565 100644 --- a/src/socketengines/socketengine_poll.cpp +++ b/src/socketengines/socketengine_poll.cpp @@ -20,9 +20,6 @@ */ -#include "inspircd.h" -#include "exitcodes.h" - #ifndef SOCKETENGINE_POLL #define SOCKETENGINE_POLL @@ -30,7 +27,7 @@ #include <vector> #include <string> #include <map> -#include "inspircd_config.h" +#include "config.h" #include "inspircd.h" #include "socketengine.h" diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp index 52d799ddf..58d069886 100644 --- a/src/socketengines/socketengine_ports.cpp +++ b/src/socketengines/socketengine_ports.cpp @@ -32,7 +32,6 @@ #include <vector> #include <string> #include <map> -#include "inspircd_config.h" #include "inspircd.h" #include "socketengine.h" #include <port.h> diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp index eba54a7cb..02ab077ca 100644 --- a/src/socketengines/socketengine_select.cpp +++ b/src/socketengines/socketengine_select.cpp @@ -18,8 +18,6 @@ */ -#include "inspircd_config.h" - #include "inspircd.h" #include "socketengine.h" |