Merge commit 'f2699501bc20a1dc5ee965ca1cbb8f18a3471ff8'

diff --git a/src/shared/libosmocore/include/osmocom/core/bitvec.h b/src/shared/libosmocore/include/osmocom/core/bitvec.h
index bbe1641..7cb8a87 100644 (file)
--- a/src/shared/libosmocore/include/osmocom/core/bitvec.h
+++ b/src/shared/libosmocore/include/osmocom/core/bitvec.h
@@ -23,6 +23,7 @@
  *
  */
 
+#include <stdint.h>
 
 /* In GSM mac blocks, every bit can be 0 or 1, or L or H.  L/H are
  * defined relative to the 0x2b padding pattern */

diff --git a/src/shared/libosmocore/src/gsm/sysinfo.c b/src/shared/libosmocore/src/gsm/sysinfo.c
index 0dbff3a..9df1887 100644 (file)
--- a/src/shared/libosmocore/src/gsm/sysinfo.c
+++ b/src/shared/libosmocore/src/gsm/sysinfo.c
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
-#include <netinet/in.h>
 
 #include <osmocom/core/bitvec.h>
 #include <osmocom/core/utils.h>
@@ -71,7 +70,7 @@ static const uint8_t sitype2rsl[_MAX_SYSINFO_TYPE] = {
        [SYSINFO_TYPE_5ter]     = RSL_SYSTEM_INFO_5ter,
 };
 
-static const uint8_t rsl2sitype[0xff] = {
+static const uint8_t rsl2sitype[256] = {
        [RSL_SYSTEM_INFO_1] = SYSINFO_TYPE_1,
        [RSL_SYSTEM_INFO_2] = SYSINFO_TYPE_2,
        [RSL_SYSTEM_INFO_3] = SYSINFO_TYPE_3,

diff --git a/src/shared/libosmocore/src/socket.c b/src/shared/libosmocore/src/socket.c
index 901b8cd..014bbaa 100644 (file)
--- a/src/shared/libosmocore/src/socket.c
+++ b/src/shared/libosmocore/src/socket.c
@@ -6,10 +6,8 @@
 #include <osmocom/core/select.h>
 #include <osmocom/core/socket.h>
 
-#include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <netinet/in.h>
 
 #include <stdio.h>
 #include <unistd.h>