diff options
| -rw-r--r-- | Changes | 3 | ||||
| -rw-r--r-- | docs/README | 1 | ||||
| -rw-r--r-- | include/services.h | 7 | ||||
| -rw-r--r-- | src/compat.c | 20 | ||||
| -rw-r--r-- | src/init.c | 8 | ||||
| -rw-r--r-- | src/protocol/Makefile.win32 | 4 | ||||
| -rw-r--r-- | src/protocol/inspircd.c | 2 | ||||
| -rw-r--r-- | version.log | 6 |
8 files changed, 12 insertions, 39 deletions
@@ -1,6 +1,9 @@ Anope Version S V N -------------------- Provided by Anope Dev. <dev@anope.org> - 2006 +04/08 F Fixed Charybdis support on win32. [#487] +04/08 F Fixed thread stuff on windows. [#488] +04/08 F Fixed SGLine stuff on inspircd (not supported). [#489] Anope Version 1.7.14 diff --git a/docs/README b/docs/README index 0f0fa9b22..afa7d32e9 100644 --- a/docs/README +++ b/docs/README @@ -164,6 +164,7 @@ Table of Contents * Plexus 2.0 or later * Ratbox 2.0.6 or later * ShadowIRCd 4.0 beta 7 or later + * Charybdis Anope could also work with some of the daemons derived by the ones listed above, but there's no support for them if they work or don't work. diff --git a/include/services.h b/include/services.h index 239e89740..5714fbe69 100644 --- a/include/services.h +++ b/include/services.h @@ -137,13 +137,6 @@ # include <sys/select.h> #endif -#ifdef USE_THREADS - #ifndef _WIN32 - #include <pthread.h> - #endif -#include "threads.h" -#endif - #include "sockets.h" #ifndef va_copy diff --git a/src/compat.c b/src/compat.c index a45483542..d7fdd63ff 100644 --- a/src/compat.c +++ b/src/compat.c @@ -224,25 +224,5 @@ char *strsignal(int signum) } #endif -#ifdef _WIN32 - -#ifdef USE_THREADS -/* Simulate pthread conditional variable waiting */ -int ano_cond_wait(ano_cond_t cond, ano_mutex_t mutex) -{ - ReleaseMutex(mutex); - if (WaitForSingleObject(cond, INFINITE) == WAIT_FAILED) - return 1; - if (WaitForSingleObject(mutex, INFINITE) == WAIT_FAILED) - return 1; - return 0; -} - -/* Used for the cleanup functions */ -ano_thread_start __declspec(thread) cleanup_func = NULL; - -#endif - -#endif /*************************************************************************/ diff --git a/src/init.c b/src/init.c index b2bb35e1a..c589d886a 100644 --- a/src/init.c +++ b/src/init.c @@ -529,15 +529,7 @@ int init_secondary(int ac, char **av) signal(i, SIG_IGN); } -#ifndef USE_THREADS signal(SIGINT, sighandler); -#else - if (nofork) { - signal(SIGINT, sighandler); - } else { - signal(SIGINT, SIG_DFL); - } -#endif signal(SIGTERM, sighandler); #ifndef _WIN32 signal(SIGQUIT, sighandler); diff --git a/src/protocol/Makefile.win32 b/src/protocol/Makefile.win32 index f9fe5772c..c4e0ec951 100644 --- a/src/protocol/Makefile.win32 +++ b/src/protocol/Makefile.win32 @@ -1,7 +1,7 @@ include ../../Makefile.inc.win32 -SRCS=bahamut.c dreamforge.c hybrid.c inspircd.c plexus.c ptlink.c rageircd.c ratbox.c \ - shadowircd.c solidircd.c ultimate2.c ultimate3.c unreal31.c unreal32.c viagra.c +SRCS=bahamut.c charybdis.c dreamforge.c hybrid.c inspircd.c plexus.c ptlink.c rageircd.c \ + ratbox.c shadowircd.c solidircd.c ultimate2.c ultimate3.c unreal31.c unreal32.c viagra.c OBJECTS= $(SRCS:.c=.dll) CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include" diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c index 7ec1fb679..e2e11e87f 100644 --- a/src/protocol/inspircd.c +++ b/src/protocol/inspircd.c @@ -62,7 +62,7 @@ IRCDVar myIrcd[] = { "+r", /* Mode On Reg */ "-r", /* Mode on UnReg */ "-r", /* Mode on Nick Change */ - 1, /* Supports SGlines */ + 0, /* Supports SGlines */ 1, /* Supports SQlines */ 1, /* Supports SZlines */ 1, /* Supports Halfop +h */ diff --git a/version.log b/version.log index a2a39a11a..dac69a5dc 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="14" VERSION_EXTRA="" -VERSION_BUILD="1025" +VERSION_BUILD="1026" # $Log$ # +# BUILD : 1.7.14 (1026) +# BUGS : 487 488 489 +# NOTES : some fixes. +# # BUILD : 1.7.14 (1025) # BUGS : # NOTES : Development Framework (1.7.14-svn) |