summaryrefslogtreecommitdiffstats
path: root/src/shared/libosmocore
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2011-05-29 15:53:59 +0200
committerSylvain Munaut <tnt@246tNt.com>2011-05-29 15:53:59 +0200
commitda37aa275e2f408e0cee2e84e5efac0cd17d942b (patch)
tree3180f21e304efedbe2bb059a242101f4b58f87af /src/shared/libosmocore
parent783730eae1cc9eb35f410d1be8f5fb93a1ec6423 (diff)
parentf2699501bc20a1dc5ee965ca1cbb8f18a3471ff8 (diff)
Merge commit 'f2699501bc20a1dc5ee965ca1cbb8f18a3471ff8'
Diffstat (limited to 'src/shared/libosmocore')
-rw-r--r--src/shared/libosmocore/include/osmocom/core/bitvec.h1
-rw-r--r--src/shared/libosmocore/src/gsm/sysinfo.c3
-rw-r--r--src/shared/libosmocore/src/socket.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/libosmocore/include/osmocom/core/bitvec.h b/src/shared/libosmocore/include/osmocom/core/bitvec.h
index bbe1641b..7cb8a873 100644
--- 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 0dbff3ae..9df18877 100644
--- 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 901b8cdf..014bbaa2 100644
--- 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>