- Changed Velcro/build to actually be able to compile to get included into

  u3 space
- Patched #002531 by Stealth, removing /stats H

diff --git a/Changes b/Changes
index 91df08f45bac8c7405fa091b1f55dea492ce953a..54c2d6871980232be69e62a5e979e3e86c2082d8 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1732,3 +1732,6 @@ MOTDs
   with a new module API. Is currently not autoconf'ied, makefile'ed, etc.
   May the screaming commence.
 - Changed Velcro/build script to fix a bug
+- Changed Velcro/build to actually be able to compile to get included into
+  u3 space
+- Patched #002531 by Stealth, removing /stats H

diff --git a/src/modules/m_stats.c b/src/modules/m_stats.c
index 62d879b4812f04533d5d2b6ebfebfd7609c690b5..3ffed218976360863e3218539ab36cd1f88dffed 100644 (file)
--- a/src/modules/m_stats.c
+++ b/src/modules/m_stats.c
@@ -139,7 +139,6 @@ struct statstab StatsTable[] = {
        { 'E', "exceptban",     stats_exceptban,        0               },
        { 'F', "denydcc",       stats_denydcc,          0               },
        { 'G', "gline",         stats_gline,            FLAGS_AS_PARA   },
-       { 'H', "link",          stats_links,            0               },      
        { 'I', "allow",         stats_allow,            0               },
        { 'K', "kline",         stats_kline,            0               },
        { 'L', "linkinfoall",   stats_linkinfoall,      SERVER_AS_PARA  },
@@ -161,7 +160,6 @@ struct statstab StatsTable[] = {
        { 'e', "exceptthrottle",stats_exceptthrottle,   0               },
        { 'f', "spamfilter",    stats_spamfilter,       FLAGS_AS_PARA   },      
        { 'g', "gline",         stats_gline,            FLAGS_AS_PARA   },
-       { 'h', "link",          stats_links,            0               },
        { 'j', "officialchans", stats_officialchannels, 0               },
        { 'k', "kline",         stats_kline,            0               },
        { 'l', "linkinfo",      stats_linkinfo,         SERVER_AS_PARA  },

diff --git a/u4modules/Velcro.module b/u4modules/Velcro.module
index 16588daf8354079ae5c88f6984a8ac580e750d30..65c3d651553eadb222a3fca419c353c93b16dd61 100644 (file)
--- a/u4modules/Velcro.module
+++ b/u4modules/Velcro.module
@@ -98,6 +98,69 @@ class ExtensionHolder
 };
 
 implementation:
+extern "C"
+{
+#include "config.h"
+#include "struct.h"
+#include "common.h"
+#include "sys.h"
+#include "numeric.h"
+#include "msg.h"
+#include "proto.h"
+#include "channel.h"
+#include <time.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32
+#include <io.h>
+#endif
+#include <fcntl.h>
+#include "h.h"
+#ifdef STRIPBADWORDS
+#include "badwords.h"
+#endif
+#ifdef _WIN32
+#include "version.h"
+#endif
+}
+extern "C" DLLFUNC CMD_FUNC(m_COMMAND);
+
+#define MSG_UCOMMAND   "UCOMMAND"      
+#define TOK_UCOMMAND   "%%"    
+
+ModuleHeader MOD_HEADER(m_COMMAND)
+  = {
+       "Velcro",
+       "$Id$",
+       "Velcro module system", 
+       "3.2-b8-1",
+       NULL 
+    };
+
+extern "C" DLLFUNC int MOD_INIT(m_COMMAND)(ModuleInfo *modinfo)
+{
+       CommandAdd(modinfo->handle, MSG_UCOMMAND, TOK_UCOMMAND, m_COMMAND, MAXPARA, M_USER|M_SERVER);
+       MARK_AS_OFFICIAL_MODULE(modinfo);
+       return MOD_SUCCESS;
+}
+
+extern "C" DLLFUNC int MOD_LOAD(m_COMMAND)(int module_load)
+{
+       return MOD_SUCCESS;
+}
+
+extern "C" DLLFUNC int MOD_UNLOAD(m_COMMAND)(int module_unload)
+{
+       return MOD_SUCCESS;
+}
+
+extern "C" DLLFUNC CMD_FUNC(m_COMMAND) 
+{
+       return 0;
+}
+
 
 using namespace std;
 

diff --git a/velcro/build b/velcro/build
index 101b9781f08f56530ff17fa1f53603897c52d1bb..02fac69ea610d3da06ce768b3950025b8241d72e 100755 (executable)
--- a/velcro/build
+++ b/velcro/build
@@ -4,5 +4,5 @@ echo --- Preprocessing $1 ..
 echo --- Building dependancies for $1
 cat $1.depends | ../velcro/epl ../velcro/build
 echo --- Building $1 
-g++ -fPIC -DPIC -shared -export-dynamic -o $1.so $1.cc
+g++ -DDYNAMIC_LINKING -fPIC -DPIC -shared -export-dynamic -I../extras/regexp/include -I../include -o $1.so $1.cc
 echo --- Done building $1