[PATCH 3/4] Use __linux__ conditional, not LINUX.
From: Pavel Roskin <hidden>
Date: 2016-06-15 22:42:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Pavel Roskin <redacted> __linux__ is defined automatically, LINUX is not. Signed-off-by: Pavel Roskin <redacted> --- cbtcommon/tcpsocket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
index 27cc13a..a174007 100644
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c@@ -185,14 +185,14 @@ #endif int convert_address(long *dest, const char *addr_str) { -#ifdef LINUX +#ifdef __linux__ struct in_addr ip; #endif int retval = 0; char errstr[256]; /* first try converting "numbers and dots" notation */ -#ifdef LINUX +#ifdef __linux__ if ( inet_aton(addr_str, &ip) ) { memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));