diff options
| author | Breno Leitao <breno.leitao@gmail.com> | 2017-05-10 20:07:49 +0000 |
|---|---|---|
| committer | Breno Leitao <breno.leitao@gmail.com> | 2017-05-10 20:09:20 +0000 |
| commit | c6f31c458a213bf82cf3c28bfa78b850dace3922 (patch) | |
| tree | 66eb9c75e23ce470bddd3ecbf520261cdc62a8e3 /testing/dante/ifdev.patch | |
| parent | d53497536d479694e9a43c6d7355916add8890f7 (diff) | |
| download | aports-c6f31c458a213bf82cf3c28bfa78b850dace3922.tar.bz2 aports-c6f31c458a213bf82cf3c28bfa78b850dace3922.tar.xz | |
testing/dante: Fix build on new compiler
Dante is failing because they are using #if MACRO, where MACRO is just a
number.
In this case, they just use #ifdef or #if defined(MACRO). Fixing it to
enable dante to be buildable.
Diffstat (limited to 'testing/dante/ifdev.patch')
| -rw-r--r-- | testing/dante/ifdev.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/testing/dante/ifdev.patch b/testing/dante/ifdev.patch new file mode 100644 index 0000000000..541edefe03 --- /dev/null +++ b/testing/dante/ifdev.patch @@ -0,0 +1,38 @@ +--- a/sockd/sockd_io.c.old 2017-05-10 19:57:20.672000000 +0000 ++++ b/sockd/sockd_io.c 2017-05-10 20:00:34.548000000 +0000 +@@ -2912,7 +2912,7 @@ siginfo(sig, si, sc) + int src_so_rcvbuf, dst_so_rcvbuf; + #endif /* HAVE_RECVBUF_IOCTL */ + +-#if HAVE_SENDBUF_IOCTL ++#ifdef HAVE_SENDBUF_IOCTL + int src_so_sndbuf, dst_so_sndbuf; + #endif /* HAVE_SENDBUF_IOCTL */ + +@@ -2960,7 +2960,7 @@ siginfo(sig, si, sc) + *src_bufferinfo = NUL; + *dst_bufferinfo = NUL; + +-#if HAVE_RECVBUF_IOCTL || HAVE_SENDBUF_IOCTL ++#if defined(HAVE_RECVBUF_IOCTL) || defined(HAVE_SENDBUF_IOCTL) + + havesocketinfo = 1; + +@@ -2987,7 +2987,7 @@ siginfo(sig, si, sc) + } + #endif /* HAVE_RECVBUF_IOCTL */ + +-#if HAVE_SENDBUF_IOCTL ++#ifdef HAVE_SENDBUF_IOCTL + if (havesocketinfo) { + if (ioctl(src->s, SENDBUF_IOCTLVAL, &src_so_sndbuf) != 0) { + swarn("%s: sendbuf size ioctl() on src-fd %d failed", +@@ -3005,7 +3005,7 @@ siginfo(sig, si, sc) + } + #endif /* HAVE_SENDBUF_IOCTL */ + +-#if HAVE_SENDBUF_IOCTL && HAVE_RECVBUF_IOCTL ++#ifdef HAVE_SENDBUF_IOCTL && HAVE_RECVBUF_IOCTL + if (havesocketinfo) { + snprintf(src_bufferinfo, sizeof(src_bufferinfo), + "%lu buffered (%lu + %lu + %lu)", |