Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/13140
Change subject: NOT FOR MERGE: test ip_port.c tweaks on ARM
......................................................................
NOT FOR MERGE: test ip_port.c tweaks on ARM
Change-Id: I64e372d73d48641494838feddf2b7ba2189ed7f8
---
M configure.ac
M include/osmocom/core/ip_port.h
M src/ip_port.c
3 files changed, 1 insertion(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/13140/1
diff --git a/configure.ac b/configure.ac
index d717a0b..4a00e69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@
dnl checks for header files
AC_HEADER_STDC
-AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h sys/timerfd.h syslog.h
ctype.h netinet/tcp.h netinet/in.h)
+AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h sys/timerfd.h syslog.h
ctype.h netinet/tcp.h)
# for src/conv.c
AC_FUNC_ALLOCA
AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DLOPEN="$LIBS";LIBS=""])
diff --git a/include/osmocom/core/ip_port.h b/include/osmocom/core/ip_port.h
index a1ae0ca..068e94a 100644
--- a/include/osmocom/core/ip_port.h
+++ b/include/osmocom/core/ip_port.h
@@ -32,12 +32,6 @@
#include <stdbool.h>
#include <arpa/inet.h>
-struct in_addr;
-struct in6_addr;
-struct sockaddr_storage;
-struct sockaddr_in;
-struct sockaddr_in6;
-
/*! \defgroup ip_port IP address/port utilities.
* @{
* \file ip_port.h
diff --git a/src/ip_port.c b/src/ip_port.c
index 0f0e39a..dd977ec 100644
--- a/src/ip_port.c
+++ b/src/ip_port.c
@@ -26,9 +26,6 @@
*
*/
-#include "config.h"
-
-#ifdef HAVE_NETINET_IN_H
#include <string.h>
#include <errno.h>
#include <netinet/in.h>
@@ -375,4 +372,3 @@
}
/*! @} */
-#endif // HAVE_NETINET_IN_H
--
To view, visit https://gerrit.osmocom.org/13140
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64e372d73d48641494838feddf2b7ba2189ed7f8
Gerrit-Change-Number: 13140
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <[email protected]>
