diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-26 21:43:16 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:34 +0200 |
| commit | 981bf0a1aae76430f2a9886acfd616e388cbecf4 (patch) | |
| tree | fa40d618a240613d3cf89699251936d1d1044262 /ldso/include/dl-string.h | |
| parent | 77de40bc26edb2570dd68c66107f4556eebb02d0 (diff) | |
dl-string.h: include dl-defs.h instead of dl-sysdep.h
Include stddef.h instead of defining NULL
Adapt guard to file name.
Reorder includes a bit.
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'ldso/include/dl-string.h')
| -rw-r--r-- | ldso/include/dl-string.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h index c01881cb4..aacad1038 100644 --- a/ldso/include/dl-string.h +++ b/ldso/include/dl-string.h @@ -5,12 +5,16 @@ * GNU Lesser General Public License version 2.1 or later. */ -#ifndef _LINUX_STRING_H_ -#define _LINUX_STRING_H_ +#ifndef _DL_STRING_H +#define _DL_STRING_H -#include <dl-sysdep.h> /* for do_rem */ #include <features.h> +#define __need_NULL +#include <stddef.h> + +#include <dl-defs.h> /* for do_rem by dl-sysdep.h */ + /* provide some sane defaults */ #ifndef do_rem # define do_rem(result, n, base) ((result) = (n) % (base)) @@ -19,10 +23,6 @@ # define do_div_10(result, remain) ((result) /= 10) #endif -#ifndef NULL -#define NULL ((void *) 0) -#endif - #ifdef IS_IN_rtld static __always_inline size_t _dl_strlen(const char *str) { @@ -345,4 +345,4 @@ static __always_inline char * _dl_simple_ltoahex(char *local, unsigned long i) #endif /* IS_IN_rtld */ -#endif +#endif /* _DL_STRING_H */ |