Due to the old style of having user libraries include their own headers as both <libname/foo.h> and <foo.h>, we had to have a few hacks to force us to include the 'real' headers that we wanted.
Now that we do things the right way, we don't need to carry those hacks around. Signed-off-by: Barret Rhoden <[email protected]> --- user/parlib/Makefile | 1 - user/parlib/include/parlib/assert.h | 6 +----- user/parlib/include/parlib/signal.h | 6 +----- user/parlib/include/parlib/stdio.h | 6 +----- user/perfmon/Makefile | 3 +-- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/user/parlib/Makefile b/user/parlib/Makefile index 10b3c7585879..34d9c2cc769d 100644 --- a/user/parlib/Makefile +++ b/user/parlib/Makefile @@ -1,3 +1,2 @@ LIBNAME = parlib -CFLAGS_USER += -DBUILDING_PARLIB include ../Makefrag-user-lib diff --git a/user/parlib/include/parlib/assert.h b/user/parlib/include/parlib/assert.h index 134784643e52..cde95d9441a6 100644 --- a/user/parlib/include/parlib/assert.h +++ b/user/parlib/include/parlib/assert.h @@ -2,11 +2,7 @@ #pragma once -#ifdef BUILDING_PARLIB -# include_next "assert.h" -#else -# include <assert.h> -#endif +#include <assert.h> /* For __BEGIN_DECLS. Most every header gets it already from features.h. */ #include <sys/cdefs.h> /* So we can undefine warn */ diff --git a/user/parlib/include/parlib/signal.h b/user/parlib/include/parlib/signal.h index eb9ca33f2225..355fdab5548e 100644 --- a/user/parlib/include/parlib/signal.h +++ b/user/parlib/include/parlib/signal.h @@ -4,12 +4,8 @@ */ #pragma once -#ifdef BUILDING_PARLIB -#include_next "signal.h" -#else -#include <signal.h> -#endif +#include <signal.h> #include <ros/procinfo.h> struct uthread; diff --git a/user/parlib/include/parlib/stdio.h b/user/parlib/include/parlib/stdio.h index 0c5ddabdab14..366bf21b6635 100644 --- a/user/parlib/include/parlib/stdio.h +++ b/user/parlib/include/parlib/stdio.h @@ -6,11 +6,7 @@ #pragma once -#ifdef BUILDING_PARLIB -# include_next "stdio.h" -#else -# include <stdio.h> -#endif +#include <stdio.h> #include <stdarg.h> __BEGIN_DECLS diff --git a/user/perfmon/Makefile b/user/perfmon/Makefile index fe114b340552..6a7ae231516a 100644 --- a/user/perfmon/Makefile +++ b/user/perfmon/Makefile @@ -1,4 +1,3 @@ LIBNAME = perfmon -CFLAGS_USER += -DBUILDING_PERFMON -DCONFIG_PFMLIB_ARCH_X86 \ - -DCONFIG_PFMLIB_ARCH_X86_64 +CFLAGS_USER += -DCONFIG_PFMLIB_ARCH_X86 -DCONFIG_PFMLIB_ARCH_X86_64 include ../Makefrag-user-lib -- 2.7.0.rc3.207.g0ac5344 -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
