diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2005-01-21 22:45:35 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2005-01-21 22:45:35 +0000 |
| commit | 0d252eea07c8a02b08a98c9320479a9404662a94 (patch) | |
| tree | 80e1848dcd84899bc65cc408abd8ec1d5f390924 /irc/undernet-ircu | |
| parent | 6f60689f765ca9c2a1e0ad65d03e4f926220d956 (diff) | |
| download | ports-0d252eea07c8a02b08a98c9320479a9404662a94.tar.gz ports-0d252eea07c8a02b08a98c9320479a9404662a94.zip | |
Fix build on 4.x
Notes
Notes:
svn path=/head/; revision=127060
Diffstat (limited to 'irc/undernet-ircu')
| -rw-r--r-- | irc/undernet-ircu/files/patch-ircd_ircd__log.c | 15 | ||||
| -rw-r--r-- | irc/undernet-ircu/files/patch-ircd_send.c | 16 |
2 files changed, 27 insertions, 4 deletions
diff --git a/irc/undernet-ircu/files/patch-ircd_ircd__log.c b/irc/undernet-ircu/files/patch-ircd_ircd__log.c index d248df1d3d64..6c30d97d23f1 100644 --- a/irc/undernet-ircu/files/patch-ircd_ircd__log.c +++ b/irc/undernet-ircu/files/patch-ircd_ircd__log.c @@ -3,12 +3,23 @@ $FreeBSD$ --- ircd/ircd_log.c.orig +++ ircd/ircd_log.c -@@ -395,7 +395,7 @@ +@@ -49,6 +49,7 @@ + #include <syslog.h> + #include <time.h> + #include <unistd.h> ++#include <osreldate.h> + + #define LOG_BUFSIZE 2048 + +@@ -395,7 +396,11 @@ /* Build the basic log string */ vd.vd_format = fmt; -- vd.vd_args = vl; ++ #if __FreeBSD_version > 500000 && defined(__amd64__) + va_copy(vd.vd_args, vl); ++ #else + vd.vd_args = vl; ++ #endif /* save the length for writev */ /* Log format: "SYSTEM [SEVERITY]: log message" */ diff --git a/irc/undernet-ircu/files/patch-ircd_send.c b/irc/undernet-ircu/files/patch-ircd_send.c index ec275840eafb..a5299acc4969 100644 --- a/irc/undernet-ircu/files/patch-ircd_send.c +++ b/irc/undernet-ircu/files/patch-ircd_send.c @@ -3,12 +3,24 @@ $FreeBSD$ --- ircd/send.c.orig +++ ircd/send.c -@@ -697,7 +697,7 @@ +@@ -44,7 +44,7 @@ + #include <assert.h> + #include <stdio.h> + #include <string.h> +- ++#include <osreldate.h> + + static int sentalong[MAXCONNECTIONS]; + static int sentalong_marker; +@@ -697,7 +697,11 @@ * this is ok... */ vd.vd_format = pattern; -- vd.vd_args = vl; ++ #if __FreeBSD_version > 500000 && defined(__amd64__) + va_copy(vd.vd_args, vl); ++ #else + vd.vd_args = vl; ++ #endif mb = msgq_make(0, ":%s " MSG_NOTICE " * :*** Notice -- %v", cli_name(&me), &vd); |