preproc fixes for gcc3.
This commit is contained in:
espie
parent
17fbcc7983
commit
862d40525d
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-include_config_h,v 1.2 2002/06/30 18:23:31 brad Exp $
|
||||
--- include/config.h.orig Mon Jan 8 01:24:22 2001
|
||||
+++ include/config.h Sun Jun 30 14:19:43 2002
|
||||
$OpenBSD: patch-include_config_h,v 1.3 2004/01/04 23:46:49 espie Exp $
|
||||
--- include/config.h.orig 2001-01-08 07:24:22.000000000 +0100
|
||||
+++ include/config.h 2004-01-05 00:38:14.000000000 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
* too peruse this function all you like. It's not a BACKDOOR in any way,
|
||||
* shape or form.
|
||||
*/
|
||||
-#define WANT_NOTIFY_BITCHX_COM ON
|
||||
+#undef WANT_NOTIFY_BITCHX_COM ON
|
||||
+#undef WANT_NOTIFY_BITCHX_COM /* ON */
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@ -1,6 +1,17 @@
|
||||
$OpenBSD: patch-source_commands_c,v 1.2 2002/06/30 18:23:31 brad Exp $
|
||||
--- source/commands.c.orig Mon Jan 8 01:24:22 2001
|
||||
+++ source/commands.c Thu Feb 28 17:29:03 2002
|
||||
$OpenBSD: patch-source_commands_c,v 1.3 2004/01/04 23:46:49 espie Exp $
|
||||
--- source/commands.c.orig 2001-01-08 07:24:22.000000000 +0100
|
||||
+++ source/commands.c 2004-01-05 00:38:36.000000000 +0100
|
||||
@@ -203,8 +203,8 @@ IrcCommand irc_command[] =
|
||||
{ "ADDLAMENICK","AddLameNick", add_bad_nick, 0, "%Y<%Cnick%G|%Cnick%C nick nick%Y>%n\n - Adds %Y<%Cnick%Y>%n to your lame nicklist, bans nick!*@*"},
|
||||
{ "ADDNOFLOOD", "AddNoFlood", add_no_flood, 0, "%Y<%Cnick%Y>%n\n - Adds %Cnick%n to your no flood list" },
|
||||
#ifdef WANT_USERLIST
|
||||
- { "ADDSHIT", "AddShit", add_shit, 0, "%Y<%Cnick%G|%Cnick%G!%nuser%Y@%n
|
||||
- hostname%Y>%n %Y<%Bchannel%G|%Y*>%n %R[%nshitlevel%R]%n %R[%nreason%R]%n\n- Add %Y<%Cnick%G|%Cnick%G!%nuser%Y@%nhostname%Y>%n to your shitlist on %Y<%Bchannel%G|%Y*>%n with %R[%nshitlevel%R]%n and for %R[%nreason%R]%n" },
|
||||
+ { "ADDSHIT", "AddShit", add_shit, 0, "%Y<%Cnick%G|%Cnick%G!%nuser%Y@%n\n"
|
||||
+" hostname%Y>%n %Y<%Bchannel%G|%Y*>%n %R[%nshitlevel%R]%n %R[%nreason%R]%n\n- Add %Y<%Cnick%G|%Cnick%G!%nuser%Y@%nhostname%Y>%n to your shitlist on %Y<%Bchannel%G|%Y*>%n with %R[%nshitlevel%R]%n and for %R[%nreason%R]%n" },
|
||||
{ "ADDUSER", "AddUser", add_user, 0, "%Y<%Cnick%G|%Cnick%G!%nuser%Y@%nhostname%Y>%n %Y<%Bchannel%G|%Y*>%n %R[%nuserlevel%R]%n %R[%nauto-op%R]%n %R[%nprotection%R]%n %R[%npassword%R]%n\n - Adds %Y<%Cnick%G|%Cnick%G!%nuser%Y@%nhostname%Y>%n on %Y<%Bchannel%G|%Y*>%n with %R[%nuserlevel%R]%n %R[%nauto-op%R]%n and %R[%nprotection%R]%n levels to your userlist" },
|
||||
#endif
|
||||
{ "ADDWORD", NULL, add_ban_word, 0, "%Y<%Bchannel%G|%Y*>%n %Y<%nword%y(%ns%y)%Y>%n\n- Adds %Y<%nword%y(%ns%y)%Y>%n to wordlist, anyone saying it in %Y<%Bchannel%G|%Y*>%n will be kicked" },
|
||||
@@ -2604,13 +2604,13 @@ BUILT_IN_COMMAND(e_hostname)
|
||||
int i;
|
||||
char *newhost = NULL;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-source_misc_c,v 1.1 2003/03/27 15:46:11 brad Exp $
|
||||
--- source/misc.c.orig Mon Jan 8 01:24:22 2001
|
||||
+++ source/misc.c Wed Mar 26 23:00:45 2003
|
||||
$OpenBSD: patch-source_misc_c,v 1.2 2004/01/04 23:46:49 espie Exp $
|
||||
--- source/misc.c.orig 2001-01-08 07:24:22.000000000 +0100
|
||||
+++ source/misc.c 2004-01-05 00:37:21.000000000 +0100
|
||||
@@ -3108,42 +3108,47 @@ char *cluster (char *hostname)
|
||||
static char result[IRCD_BUFFER_SIZE/4 + 1];
|
||||
char temphost[BIG_BUFFER_SIZE + 1];
|
||||
@ -23,6 +23,11 @@ $OpenBSD: patch-source_misc_c,v 1.1 2003/03/27 15:46:11 brad Exp $
|
||||
- {
|
||||
- result[8] = '*';
|
||||
- result[9] = '\0';
|
||||
- }
|
||||
- strcat(result, "@");
|
||||
- if (!(hostname = strchr(hostname, '@')))
|
||||
- return NULL;
|
||||
- hostname++;
|
||||
+
|
||||
+ atsign = strchr(hostname, '@');
|
||||
+ if (atsign) {
|
||||
@ -40,11 +45,7 @@ $OpenBSD: patch-source_misc_c,v 1.1 2003/03/27 15:46:11 brad Exp $
|
||||
+ result[9] = '@';
|
||||
+ result[10] = '\0';
|
||||
+ }
|
||||
}
|
||||
- strcat(result, "@");
|
||||
- if (!(hostname = strchr(hostname, '@')))
|
||||
- return NULL;
|
||||
- hostname++;
|
||||
+ }
|
||||
+ hostname = atsign + 1;
|
||||
+ } else {
|
||||
+ *result = 0;
|
||||
@ -83,7 +84,7 @@ $OpenBSD: patch-source_misc_c,v 1.1 2003/03/27 15:46:11 brad Exp $
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3175,16 +3180,17 @@ char *cluster (char *hostname)
|
||||
@@ -3175,17 +3180,18 @@ char *cluster (char *hostname)
|
||||
else
|
||||
return (char *) NULL;
|
||||
}
|
||||
@ -99,9 +100,10 @@ $OpenBSD: patch-source_misc_c,v 1.1 2003/03/27 15:46:11 brad Exp $
|
||||
}
|
||||
return result;
|
||||
}
|
||||
-
|
||||
-
|
||||
-
|
||||
|
||||
-
|
||||
-
|
||||
-
|
||||
struct _sock_manager
|
||||
{
|
||||
int init;
|
||||
|
||||
12
net/bitchx/patches/patch-source_status_c
Normal file
12
net/bitchx/patches/patch-source_status_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-source_status_c,v 1.1 2004/01/04 23:46:49 espie Exp $
|
||||
--- source/status.c.orig 2004-01-05 00:41:02.000000000 +0100
|
||||
+++ source/status.c 2004-01-05 00:41:35.000000000 +0100
|
||||
@@ -1216,7 +1216,7 @@ static char my_buffer[MY_BUFFER+1];
|
||||
* current-type window, although i think they should go to all windows.
|
||||
*/
|
||||
#define STATUS_VAR(x) \
|
||||
-static char *status_user ## x ## (Window *window) \
|
||||
+static char *status_user ## x (Window *window) \
|
||||
{ \
|
||||
char *text; \
|
||||
\
|
||||
Loading…
Reference in New Issue
Block a user