From 37edeed072a0c3e126df9fc5584259cd09030e93 Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Apr 11 2016 22:51:57 +0000 Subject: Move include/cdefs.h to include/sys/cdefs.h, adjust makefile for changes --- diff --git a/Makefile b/Makefile index f7b89c6..1424a52 100644 --- a/Makefile +++ b/Makefile @@ -11,10 +11,11 @@ datadir ?=$(datarootdir) docdir ?=$(datarootdir)/doc/musl-compat-$(VERSION) mandir ?=$(datarootdir)/man -BINS = $(notdir $(basename $(wildcard bin/*.c))) -BINS_SH = $(notdir $(basename $(wildcard bin/*.sh))) -INCLUDES = $(notdir $(wildcard include/*.h)) -LIBS = $(notdir $(wildcard lib/*.a)) +BINS := $(notdir $(basename $(wildcard bin/*.c))) +BINS_SH := $(notdir $(basename $(wildcard bin/*.sh))) +INCLUDES := $(shell find include/ -type f -name '*.h') +INCLUDES := $(INCLUDES:include/%=%) +LIBS := $(notdir $(wildcard lib/*.a)) VERSION =1 diff --git a/include/cdefs.h b/include/cdefs.h deleted file mode 100644 index 209a623..0000000 --- a/include/cdefs.h +++ /dev/null @@ -1,26 +0,0 @@ -#warning usage of non-standard #include is deprecated - -#undef __P -#undef __PMT - -#define __P(args) args -#define __PMT(args) args - -#define __CONCAT(x,y) x ## y -#define __STRING(x) #x - -#ifdef __cplusplus -# define __BEGIN_DECLS extern "C" { -# define __END_DECLS } -#else -# define __BEGIN_DECLS -# define __END_DECLS -#endif - -#if defined(__GNUC__) && !defined(__cplusplus) -# define __THROW __attribute__ ((__nothrow__)) -# define __NTH(fct) __attribute__ ((__nothrow__)) fct -#else -# define __THROW -# define __NTH(fct) fct -#endif diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h new file mode 100644 index 0000000..209a623 --- /dev/null +++ b/include/sys/cdefs.h @@ -0,0 +1,26 @@ +#warning usage of non-standard #include is deprecated + +#undef __P +#undef __PMT + +#define __P(args) args +#define __PMT(args) args + +#define __CONCAT(x,y) x ## y +#define __STRING(x) #x + +#ifdef __cplusplus +# define __BEGIN_DECLS extern "C" { +# define __END_DECLS } +#else +# define __BEGIN_DECLS +# define __END_DECLS +#endif + +#if defined(__GNUC__) && !defined(__cplusplus) +# define __THROW __attribute__ ((__nothrow__)) +# define __NTH(fct) __attribute__ ((__nothrow__)) fct +#else +# define __THROW +# define __NTH(fct) fct +#endif