From: Landry Breuil Date: Mon, 17 Nov 2014 10:38:40 +0000 (+0100) Subject: Fix wrong #ifdef introduced in df46cd01 X-Git-Tag: collectd-5.5.0~147^2~1 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=cf3c0a7e631eb7b75566a70ce0a540660d409a34;p=collectd.git Fix wrong #ifdef introduced in df46cd01 --- diff --git a/src/tcpconns.c b/src/tcpconns.c index f716a103..0236c9d0 100644 --- 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; -#ifdef __OpenBSD__ || __NetBSD_Version__ > 699002700 +#if !defined(__OpenBSD__) && (defined(__NetBSD_Version__) && __NetBSD_Version__ <= 699002700) struct inpcb *head; #endif struct inpcb *next; @@ -966,7 +966,7 @@ static int conn_read (void) if (status != 0) return (-1); -#ifdef __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); @@ -984,7 +984,7 @@ static int conn_read (void) kread ((u_long) next, &inpcb, sizeof (inpcb)); /* Advance `next' */ -#ifdef __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