RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 05:32:45 +01:00
Code Releases Activity

Merge pull request #8652 from cladmi/pr/remove_nativeincludes

Browse Source 
native: remove non required NATIVEINCLUDES
This commit is contained in:
Martine Lenders 2018-03-22 15:57:38 +00:00 committed by GitHub
commit 690c36b3cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/native/Makefile
View File

@ -3,5 +3,3 @@ MODULE = board
DIRS = drivers
include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

12
boards/native/Makefile.include
View File

@ -1,10 +1,8 @@
export NATIVEINCLUDES += -DNATIVE_INCLUDES
export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/
export CPU = native
# Configuration for core/include/kernel_types.h
CFLAGS += -DNATIVE_INCLUDES
USEMODULE += native-drivers
# toolchain:
@ -117,7 +115,7 @@ debug-valgrind-server: export VALGRIND_FLAGS ?= --vgdb=yes --vgdb-error=0 -v \
term-cachegrind: export CACHEGRIND_FLAGS += --tool=cachegrind
term-gprof: export TERMPROG = GMON_OUT_PREFIX=gmon.out $(ELFFILE)
all-valgrind: export CFLAGS += -DHAVE_VALGRIND_H -g
all-valgrind: export NATIVEINCLUDES += $(shell pkg-config valgrind --cflags)
all-valgrind: export CFLAGS += $(shell pkg-config valgrind --cflags)
all-debug: export CFLAGS += -g
all-cachegrind: export CFLAGS += -g
all-gprof: export CFLAGS += -pg
@ -126,8 +124,6 @@ all-asan: export CFLAGS += -fsanitize=address -fno-omit-frame-pointer -g
all-asan: export CFLAGS += -DNATIVE_IN_CALLOC
all-asan: export LINKFLAGS += -fsanitize=address -fno-omit-frame-pointer -g
export INCLUDES += $(NATIVEINCLUDES)
export CFLAGS += -DDEBUG_ASSERT_VERBOSE
# workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624

2
boards/native/drivers/Makefile
View File

@ -1,5 +1,3 @@
MODULE = native-drivers
include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

2
cpu/native/Makefile
View File

@ -27,5 +27,3 @@ ifneq (,$(filter trace,$(USEMODULE)))
endif
include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

4
cpu/native/Makefile.include
View File

@ -1,8 +1,6 @@
export NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include
# Local include for OSX
ifeq ($(BUILDOSXNATIVE),1)
export NATIVEINCLUDES += -I$(RIOTCPU)/native/osx-libc-extra
INCLUDES += -I$(RIOTCPU)/native/osx-libc-extra
endif
USEMODULE += periph

2
cpu/native/mtd/Makefile
View File

@ -1,5 +1,3 @@
MODULE := mtd_native
include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

2
cpu/native/netdev_tap/Makefile
View File

@ -1,3 +1 @@
include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

2
cpu/native/socket_zep/Makefile
View File

@ -1,3 +1 @@
include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

5
sys/posix/include/sys/bytes.h
View File

@ -28,7 +28,12 @@
extern "C" {
#endif
#ifndef __MACH__
typedef size_t socklen_t; /**< socket address length */
#else
/* Defined for OSX with a different type */
typedef __darwin_socklen_t socklen_t; /**< socket address length */
#endif
#ifdef __cplusplus
}

3
sys/posix/include/sys/socket.h
View File

@ -36,6 +36,9 @@
sa_family_t sa_prefix##family
#define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int))
#ifdef __MACH__
#define AF_LINK (18) /* Link layer interface */
#endif
#endif
#include <stdlib.h>