diff options
| author | certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b <certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2006-04-08 14:44:36 +0000 |
|---|---|---|
| committer | certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b <certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2006-04-08 14:44:36 +0000 |
| commit | 18383f90f87563933c90f020cf73e68872248079 (patch) | |
| tree | 5f3fea5a2957ff63ff801056de3d615ff40f5245 /src | |
| parent | 0e7cd3403bfdec5e7c0774c92323c412d54fbe89 (diff) | |
# BUILD : 1.7.14 (1026) # BUGS : 487 488 489 # NOTES : some fixes.
git-svn-id: svn://svn.anope.org/anope/trunk@1026 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@750 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
| -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 |
4 files changed, 3 insertions, 31 deletions
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 */ |