[git commit future 1/1] dl-string.h: include dl-defs.h instead of dl-sysdep.h
Khem Raj
raj.khem at gmail.com
Sat Mar 19 18:51:25 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=e282965d9a03fa56cad830035ad9cbdc3cea7f7d
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future
Include stddef.h instead of defining NULL
Adapt guard to file name.
Reorder includes a bit.
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
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 0bbf7c0..bfb79de 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 */
--
1.7.3.4
More information about the uClibc-cvs
mailing list