From 75d58bcfb6a757ede7acc5c2f83fb8ef4c22f741 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 16 Feb 2016 12:27:52 -0200 Subject: [PATCH] Global: rename HAVE_NULLPTR_T with HAVE_STD_NULLPTR_T This makes for a more standard name for these overrides. --- libraries/AP_Common/missing/cstddef | 2 +- mk/board_qflight.mk | 2 +- mk/board_qurt.mk | 2 +- mk/px4_targets.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_Common/missing/cstddef b/libraries/AP_Common/missing/cstddef index f7b86e313d..c261557be4 100644 --- a/libraries/AP_Common/missing/cstddef +++ b/libraries/AP_Common/missing/cstddef @@ -2,7 +2,7 @@ #include_next -#if defined(HAVE_NULLPTR_T) && !HAVE_NULLPTR_T +#if defined(HAVE_STD_NULLPTR_T) && !HAVE_STD_NULLPTR_T namespace std { typedef decltype(nullptr) nullptr_t; diff --git a/mk/board_qflight.mk b/mk/board_qflight.mk index 5663020520..e86e9fb562 100644 --- a/mk/board_qflight.mk +++ b/mk/board_qflight.mk @@ -37,7 +37,7 @@ GENERATE_TARGETS = $(GENERATE_DSP_C) $(GENERATE_ARM_C) $(QFLIGHT_BUILD)/qflight_ LIBOBJS += $(QFLIGHT_BUILD)/qflight_stub.o # Add missing parts from libc and libstdc++ -MISSING_TOOLCHAIN_FLAGS += -DHAVE_NULLPTR_T=0 -DHAVE_STD_MOVE=0 +MISSING_TOOLCHAIN_FLAGS += -DHAVE_STD_NULLPTR_T=0 -DHAVE_STD_MOVE=0 MISSING_TOOLCHAIN_FLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing # DSP build flags diff --git a/mk/board_qurt.mk b/mk/board_qurt.mk index 15ccdb5b18..0a0a7489ed 100644 --- a/mk/board_qurt.mk +++ b/mk/board_qurt.mk @@ -49,7 +49,7 @@ DSP_FLAGS=-mv5 -G0 -g $(OPT) $(DSP_WARN) -fno-exceptions -fno-strict-aliasing -f DSP_LINK_FLAGS = -mv5 -G0 -fpic -shared -Wl,-Bsymbolic -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=free -Wl,--wrap=realloc -Wl,--wrap=memalign -Wl,--wrap=__stack_chk_fail -Wl,-soname=lib$(SKETCHNAME)_skel.so # Add missing parts from libc and libstdc++ -MISSING_TOOLCHAIN_FLAGS += -DHAVE_NULLPTR_T=0 -DHAVE_STD_MOVE=0 +MISSING_TOOLCHAIN_FLAGS += -DHAVE_STD_NULLPTR_T=0 -DHAVE_STD_MOVE=0 MISSING_TOOLCHAIN_FLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing CXXFLAGS += -std=gnu++11 $(WARNFLAGS) $(WARNFLAGSCXX) $(DEPFLAGS) $(MISSING_TOOLCHAIN_FLAGS) $(CXXOPTS) $(DEFINES) $(DSP_FLAGS) diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk index 52df1913af..e85e08d792 100644 --- a/mk/px4_targets.mk +++ b/mk/px4_targets.mk @@ -41,7 +41,7 @@ EXTRAFLAGS += -DPX4_GIT_VERSION="\"$(PX4_GIT_VERSION)\"" EXTRAFLAGS += -DUAVCAN=1 # Add missing parts from libc and libstdc++ -EXTRAFLAGS += -DHAVE_NULLPTR_T=0 +EXTRAFLAGS += -DHAVE_STD_NULLPTR_T=0 EXTRAFLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing # we have different config files for V1 and V2