Fixed cmake build, removed version_flags it is no longer need, removed old unneeded defs.h and split up pseudo.h

27 files changed, 48 insertions, 114 deletions

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 19bbcfc6c..de44e4f28 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -8,7 +8,7 @@ if(MSVC OR NOT SH)
   # Generate version.h from the above executable and the version.log file from the main source directory, with dependencies to the given headers and all source files in the main Anope build
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.h
     COMMAND version_sh ${Anope_SOURCE_DIR}/version.log ${CMAKE_CURRENT_SOURCE_DIR}/version.sh ${CMAKE_CURRENT_BINARY_DIR}/version.h
-    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/version.sh DEPENDS version_sh ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${CMAKE_CURRENT_SOURCE_DIR}/pseudo.h ${CMAKE_CURRENT_SOURCE_DIR}/messages.h ${SRC_SRCS}
+    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/version.sh DEPENDS version_sh ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SRC_SRCS}
   )
   # Add version_sh to list of files for CPack to ignore
   get_target_property(version_sh_BINARY version_sh LOCATION)
@@ -19,7 +19,7 @@ else(MSVC OR NOT SH)
   # Generate version.h from version.sh and the version.log file from the main source directory, with dependencies to the given headers and all source files in the main Anope build
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.h
     COMMAND ${SH} ${CMAKE_CURRENT_SOURCE_DIR}/version.sh ${Anope_SOURCE_DIR}/version.log ${CMAKE_CURRENT_BINARY_DIR}/version.h
-    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/version.sh DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${CMAKE_CURRENT_SOURCE_DIR}/pseudo.h ${CMAKE_CURRENT_SOURCE_DIR}/messages.h ${SRC_SRCS}
+    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/version.sh DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SRC_SRCS}
   )
 endif(MSVC OR NOT SH)
 
diff --git a/include/Makefile b/include/Makefile
index 69e2473f6..4c20fa502 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,7 +1,7 @@
 
-all: services.h extern.h pseudo.h version.h
+all: services.h extern.h version.h
 
-version.h: Makefile version.sh services.h pseudo.h $(SRCS)
+version.h: Makefile version.sh services.h $(SRCS)
 	sh version.sh ../version.log $@
 
 services.h: sysconf.h config.h extern.h
@@ -10,9 +10,6 @@ services.h: sysconf.h config.h extern.h
 extern.h: slist.h
 	touch $@
 
-pseudo.h: commands.h timers.h slist.h
-	touch $@
-
 clean:
 	(rm -f language.h)
 
diff --git a/include/defs.h b/include/defs.h
deleted file mode 100644
index e571b691f..000000000
--- a/include/defs.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Set default values for any constants that should be in include files but
- *
- * (C) 2003-2010 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for furhter details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
- * 
- *
- */
-
-/*************************************************************************/
-
-#ifndef NAME_MAX
-# define NAME_MAX 255
-#endif
-
-#ifndef BUFSIZ
-# define BUFSIZ 256
-#else
-# if BUFSIZ < 256
-#  define BUFSIZ 256
-# endif
-#endif
-
-/* Length of an array: */
-#define lenof(a)	(sizeof(a) / sizeof(*(a)))
-
-/* Telling compilers about printf()-like functions: */
-#ifdef __GNUC__
-# define FORMAT(type,fmt,start) __attribute__((format(type,fmt,start)))
-#else
-# define FORMAT(type,fmt,start)
-#endif
-
-/*************************************************************************/
diff --git a/include/extern.h b/include/extern.h
index 657452fd0..757bac3dc 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -223,7 +223,6 @@ E const char version_number[];
 E const char version_number_dotted[];
 E const char version_build[];
 E char *version_protocol;
-E const char version_flags[];
 
 E std::string services_dir;
 E std::string log_filename;
diff --git a/include/pseudo.h b/include/pseudo.h
deleted file mode 100644
index 3ad6b518a..000000000
--- a/include/pseudo.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Include extra includes needed by most/all pseudo-clients.
- *
- * (C) 2003-2010 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for furhter details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
- *
- */
-
-#include "modules.h"
-#include "language.h"
-#include "timers.h"
-#include "slist.h"
diff --git a/include/services.h b/include/services.h
index c05b44eac..6d7669e63 100644
--- a/include/services.h
+++ b/include/services.h
@@ -34,9 +34,9 @@
 # define u_int32_t uint32_t
 # define u_int64_t uint64_t
 
-#  ifndef INADDR_NONE
-#   define INADDR_NONE (-1)
-#  endif
+# ifndef INADDR_NONE
+#  define INADDR_NONE (-1)
+# endif
 #endif
 
 
@@ -96,6 +96,13 @@ extern CoreExport int inet_pton(int af, const char *src, void *dst);
 extern CoreExport const char *inet_ntop(int af, const void *src, char *dst, size_t size);
 #endif
 
+/* Telling compilers about printf()-like functions: */
+#ifdef __GNUC__
+# define FORMAT(type,fmt,start) __attribute__((format(type,fmt,start)))
+#else
+# define FORMAT(type,fmt,start)
+#endif
+
 #ifdef HAVE_GETTIMEOFDAY
 # include <sys/time.h>
 #endif
@@ -141,10 +148,6 @@ extern int strncasecmp(const char *, const char *, size_t);
 #define tolower tolower_
 #define toupper toupper_
 
-/* We also have our own encrypt(). */
-#define encrypt encrypt_
-
-
 #ifdef __WINS__
 #ifndef BKCHECK
 #define BKCHECK
@@ -199,7 +202,6 @@ extern int strncasecmp(const char *, const char *, size_t);
 
 /* Miscellaneous definitions. */
 #include "hashcomp.h"
-#include "defs.h"
 #include "slist.h"
 
 /* Pull in the various bits of STL */
diff --git a/include/version.sh b/include/version.sh
index 7f14f9e1d..a32c34c5a 100644
--- a/include/version.sh
+++ b/include/version.sh
@@ -57,16 +57,6 @@ cat >$VERSIONH <<EOF
 #define VERSION_STRING "$VERSION"
 #define VERSION_STRING_DOTTED "$VERSIONDOTTED"
 
-#if defined(_WIN32)
-# if _MSC_VER >= 1400
-#  define VER_OS "W"
-# else
-#  define VER_OS "w"
-# endif
-#else
-# define VER_OS
-#endif
-
 #endif
 
 EOF
diff --git a/include/version.sh.c b/include/version.sh.c
index 7750d80f6..261a51ce4 100644
--- a/include/version.sh.c
+++ b/include/version.sh.c
@@ -188,6 +188,8 @@ void write_version(FILE * fd, const char *input)
 			until_eof = 1;
 	}
 
+	if (fdin)
+		fclose(fdin);
 }
 
 void parse_line(FILE * fd, char *line)
diff --git a/src/Makefile b/src/Makefile
index c5dec5633..04d33b040 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,8 +4,8 @@ OBJS =  actions.o base64.o bots.o botserv.o channels.o chanserv.o command.o comm
 		nickcore.o nickserv.o operserv.o process.o protocol.o regchannel.o send.o servers.o sessions.o slist.o \
 		sockets.o threadengine.o threadengine_pthread.o timers.o opertype.o users.o wildcard.o
 
-INCLUDES = ../include/commands.h ../include/defs.h  ../include/language.h \
-	../include/pseudo.h ../include/sysconf.h ../include/config.h \
+INCLUDES = ../include/commands.h ../include/language.h \
+	../include/sysconf.h ../include/config.h \
 	../include/services.h ../include/regchannel.h \
 	../include/timers.h ../include/extern.h \
 	../include/modules.h ../include/slist.h ../include/hashcomp.h \
diff --git a/src/botserv.c b/src/botserv.c
index ea675ea60..aefe37b08 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -14,9 +14,8 @@
 /*************************************************************************/
 
 #include "services.h"
-#include "pseudo.h"
-
-/*************************************************************************/
+#include "modules.h"
+#include "language.h"
 
 static UserData *get_user_data(Channel * c, User * u);
 
diff --git a/src/chanserv.c b/src/chanserv.c
index 872055df1..7f5602ed1 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -14,10 +14,8 @@
 /*************************************************************************/
 
 #include "services.h"
-#include "pseudo.h"
-
-/*************************************************************************/
-/* *INDENT-OFF* */
+#include "modules.h"
+#include "language.h"
 
 registered_channel_map RegisteredChannelList;
 
diff --git a/src/core/os_news.c b/src/core/os_news.c
index 30ae8a090..68cb827f9 100644
--- a/src/core/os_news.c
+++ b/src/core/os_news.c
@@ -14,6 +14,8 @@
 
 #include "module.h"
 
+#define lenof(a)        (sizeof(a) / sizeof(*(a)))
+
 /* List of messages for each news type.  This simplifies message sending. */
 
 #define MSG_SYNTAX	0
diff --git a/src/hostserv.c b/src/hostserv.c
index e43da5c05..ec46cdc86 100644
--- a/src/hostserv.c
+++ b/src/hostserv.c
@@ -11,9 +11,9 @@
  *
  */
 
-/*************************************************************************/
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+#include "language.h"
 
 E int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
 				 char *creator, time_t time);
diff --git a/src/init.c b/src/init.c
index 6a2698085..faa37764b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -12,7 +12,8 @@
  */
 
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+
 Uplink *uplink_server;
 
 extern void moduleAddMsgs();
@@ -194,13 +195,13 @@ int init_primary(int ac, char **av)
 
 	if (GetCommandLineArgument("version", 'v'))
 	{
-		Alog(LOG_TERMINAL) << "Anope-" << version_number << version_flags << " -- " << version_build;
+		Alog(LOG_TERMINAL) << "Anope-" << version_number << " -- " << version_build;
 		return -1;
 	}
 
 	if (GetCommandLineArgument("help", 'h'))
 	{
-		Alog(LOG_TERMINAL) << "Anope-" << version_number << version_flags << " -- " << version_build;
+		Alog(LOG_TERMINAL) << "Anope-" << version_number << " -- " << version_build;
 		Alog(LOG_TERMINAL) << "Anope IRC Services (http://www.anope.org)";
 		Alog(LOG_TERMINAL) << "Usage ./" << SERVICES_BIN << " [options] ...";
 		Alog(LOG_TERMINAL) << "-c, --config=filename.conf";
diff --git a/src/log.c b/src/log.c
index d77920cdf..bf5fd10fb 100644
--- a/src/log.c
+++ b/src/log.c
@@ -12,7 +12,6 @@
  */
 
 #include "services.h"
-#include "pseudo.h"
 
 static FILE *logfile;
 
diff --git a/src/main.c b/src/main.c
index 7a00e1e36..8b95d4a2c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -83,7 +83,6 @@ const char version_number_dotted[] = VERSION_STRING_DOTTED;
 const char version_build[] =
 	"build #" BUILD ", compiled " __DATE__ " " __TIME__;
 /* the space is needed cause if you build with nothing it will complain */
-const char version_flags[] = " " VER_OS;
 
 /******** Local variables! ********/
 
diff --git a/src/memoserv.c b/src/memoserv.c
index 0d8765631..405813332 100644
--- a/src/memoserv.c
+++ b/src/memoserv.c
@@ -12,7 +12,8 @@
 */
 
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+#include "language.h"
 
 /*************************************************************************/
 /* *INDENT-OFF* */
diff --git a/src/messages.c b/src/messages.c
index 7cf591a76..56351ea8f 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -277,8 +277,8 @@ int m_stats(const char *source, int ac, const char **av)
 
 int m_version(const char *source, int ac, const char **av)
 {
-	if (source) ircdproto->SendNumeric(Config.ServerName, 351, source, "Anope-%s %s :%s - %s (%s) -- %s", version_number, Config.ServerName, ircd->name, version_flags,
-		Config.EncModuleList.begin()->c_str(), version_build);
+	if (source)
+		ircdproto->SendNumeric(Config.ServerName, 351, source, "Anope-%s %s :%s -(%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
 	return MOD_CONT;
 }
 
diff --git a/src/nickcore.cpp b/src/nickcore.cpp
index cfca2eb2a..3becf8ab4 100644
--- a/src/nickcore.cpp
+++ b/src/nickcore.cpp
@@ -1,5 +1,5 @@
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
 
 /** Default constructor
  * @param display The display nick
diff --git a/src/nickserv.c b/src/nickserv.c
index 9dae3ac8d..be1ed5470 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -13,9 +13,8 @@
  */
 
 #include "services.h"
-#include "pseudo.h"
-
-/*************************************************************************/
+#include "modules.h"
+#include "language.h"
 
 nickalias_map NickAliasList;
 nickcore_map NickCoreList;
diff --git a/src/operserv.c b/src/operserv.c
index 672176050..fda5f5fd8 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -12,7 +12,8 @@
  */
 
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+#include "language.h"
 
 /*************************************************************************/
 
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 744fc9608..14dc68cb5 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -14,7 +14,7 @@
 /*************************************************************************/
 
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
 
 IRCDVar myIrcd[] = {
 	{"Bahamut 1.8.x", /* ircd name */
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 70a344fc3..4c698edad 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -14,7 +14,7 @@
 /*************************************************************************/
 
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
 #include "hashcomp.h"
 
 #ifndef _WIN32
@@ -252,7 +252,7 @@ class InspIRCdProto : public IRCDProto
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(NULL, "BURST");
-		send_cmd(Config.ServerName, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, Config.ServerName, ircd->name, version_flags, Config.EncModuleList.begin()->c_str(), version_build);
+		send_cmd(Config.ServerName, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
 	}
 
 	/* CHGIDENT */
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index dd416d032..e125f45d0 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -14,7 +14,7 @@
 /*************************************************************************/
 
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
 #include "hashcomp.h"
 
 #ifndef _WIN32
@@ -256,7 +256,7 @@ class InspIRCdProto : public IRCDProto
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(TS6SID, "BURST");
-		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, Config.ServerName, ircd->name, version_flags, Config.EncModuleList.begin()->c_str(), version_build);
+		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
 	}
 
 	/* CHGIDENT */
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 4b4b732cd..58ab14154 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -12,7 +12,7 @@
  */
 
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
 
 static char *TS6UPLINK = NULL; // XXX is this needed?
 
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index d63d2183a..b14c48343 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -14,7 +14,7 @@
 /*************************************************************************/
 
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
 
 IRCDVar myIrcd[] = {
 	{"UnrealIRCd 3.2.x",		/* ircd name */
diff --git a/src/sessions.c b/src/sessions.c
index cfd81bc7b..cef071443 100644
--- a/src/sessions.c
+++ b/src/sessions.c
@@ -12,7 +12,8 @@
  */
 
 #include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+#include "language.h"
 
 /*************************************************************************/