projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1023 from ciomaire/write_kafka_ldflags
[collectd.git]
/
src
/
tcpconns.c
diff --git
a/src/tcpconns.c
b/src/tcpconns.c
index
f716a10
..
0236c9d
100644
(file)
--- a/
src/tcpconns.c
+++ b/
src/tcpconns.c
@@
-951,7
+951,7
@@
static int conn_init (void)
static int conn_read (void)
{
struct inpcbtable table;
static int conn_read (void)
{
struct inpcbtable table;
-#if
def __OpenBSD__ || __NetBSD_Version__ > 699002700
+#if
!defined(__OpenBSD__) && (defined(__NetBSD_Version__) && __NetBSD_Version__ <= 699002700)
struct inpcb *head;
#endif
struct inpcb *next;
struct inpcb *head;
#endif
struct inpcb *next;
@@
-966,7
+966,7
@@
static int conn_read (void)
if (status != 0)
return (-1);
if (status != 0)
return (-1);
-#if
def __OpenBSD__ || __NetBSD_Version__ > 699002700
+#if
defined(__OpenBSD__) || (defined(__NetBSD_Version__) && __NetBSD_Version__ > 699002700)
/* inpt_queue is a TAILQ on OpenBSD */
/* Get the first pcb */
next = (struct inpcb *)TAILQ_FIRST (&table.inpt_queue);
/* inpt_queue is a TAILQ on OpenBSD */
/* Get the first pcb */
next = (struct inpcb *)TAILQ_FIRST (&table.inpt_queue);
@@
-984,7
+984,7
@@
static int conn_read (void)
kread ((u_long) next, &inpcb, sizeof (inpcb));
/* Advance `next' */
kread ((u_long) next, &inpcb, sizeof (inpcb));
/* Advance `next' */
-#if
def __OpenBSD__ || __NetBSD_Version__ > 699002700
+#if
defined(__OpenBSD__) || (defined(__NetBSD_Version__) && __NetBSD_Version__ > 699002700)
/* inpt_queue is a TAILQ on OpenBSD */
next = (struct inpcb *)TAILQ_NEXT (&inpcb, inp_queue);
#else
/* inpt_queue is a TAILQ on OpenBSD */
next = (struct inpcb *)TAILQ_NEXT (&inpcb, inp_queue);
#else