[git commit 0_9_30] use _LIBC rather than UCLIBC_INTERNAL

[Bernhard Reutner-Fischer]

commit: http://git.uclibc.org/uClibc/commit/?id=ee86a2b38fa5e4baaa28e696022dbfc193914e31
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/0_9_30

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 Rules.mak                               |    5 +----
 include/printf.h                        |    8 ++++----
 include/strings.h                       |    2 +-
 include/time.h                          |    2 +-
 include/unistd.h                        |    2 +-
 libc/sysdeps/linux/i386/bits/wordsize.h |    2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Rules.mak b/Rules.mak
index 37e65ea..73290ae 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -46,7 +46,7 @@ AWK        = awk
 
 STRIP_FLAGS ?= -x -R .note -R .comment
 
-UNIFDEF := $(top_builddir)extra/scripts/unifdef -UUCLIBC_INTERNAL
+UNIFDEF := $(top_builddir)extra/scripts/unifdef
 
 # Select the compiler needed to build binaries for your development system
 HOSTCC     = gcc
@@ -505,9 +505,6 @@ ifeq ($(TARGET_ARCH),arm)
 endif
 endif
 
-# Please let us see private headers' parts
-CFLAGS += -DUCLIBC_INTERNAL
-
 # We need this to be checked within libc-symbols.h
 ifneq ($(HAVE_SHARED),y)
 CFLAGS += -DSTATIC
diff --git a/include/printf.h b/include/printf.h
index 72dffaa..ccd2bdd 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -41,7 +41,7 @@ __BEGIN_DECLS
  * need to support bitfields since that's what glibc made visible to users.
  * So, we take
  * advantage of how gcc lays out bitfields to create an appropriate
- * mapping.  Inside uclibc (UCLIBC_INTERNAL is defined) we access the
+ * mapping.  Inside uclibc (_LIBC is defined) we access the
  * bitfields using bitmasks in a single flag variable.
  *
  * WARNING -- This may very well fail if built with -fpack-struct!!!
@@ -61,7 +61,7 @@ struct printf_info {
   int spec;
 #endif
 
-#ifndef UCLIBC_INTERNAL
+#ifndef _LIBC
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
   unsigned int space:1;         /* Space flag.  */
@@ -95,7 +95,7 @@ struct printf_info {
 #error unsupported byte order!
 #endif
 
-#else  /* UCLIBC_INTERNAL */
+#else  /* _LIBC */
 
   uint32_t _flags;	/* non-gnu */
 #define __PRINT_INFO_FLAG_space                 (1<<0)
@@ -121,7 +121,7 @@ struct printf_info {
 #define PRINT_INFO_SET_extra(INFO_PTR,VAL) \
 	((INFO_PTR)->_flags |= (((INFO_PTR)->_flags & ~1) | ((VAL) & 1)))
 
-#endif /* UCLIBC_INTERNAL */
+#endif /* _LIBC */
 
 #ifdef __UCLIBC_HAS_WCHAR__
   wchar_t pad;                  /* Padding character.  */
diff --git a/include/strings.h b/include/strings.h
index 550f4ab..7f3a456 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -91,7 +91,7 @@ extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n)
 __END_DECLS
 
 
-#ifdef UCLIBC_INTERNAL
+#ifdef _LIBC
 #error "<strings.h> should not be included from libc."
 #endif
 
diff --git a/include/time.h b/include/time.h
index f6863ed..88c5b0d 100644
--- a/include/time.h
+++ b/include/time.h
@@ -434,7 +434,7 @@ extern int getdate_r (__const char *__restrict __string,
 __END_DECLS
 
 
-#ifdef UCLIBC_INTERNAL
+#ifdef _LIBC
 /* Experiment. Grep for 'libc_hidden_proto(time)' if need to revert */
 libc_hidden_proto(time)
 #endif
diff --git a/include/unistd.h b/include/unistd.h
index 3efcf18..9664872 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1113,7 +1113,7 @@ extern char *ctermid (char *__s) __THROW;
 __END_DECLS
 
 
-#ifdef UCLIBC_INTERNAL
+#ifdef _LIBC
 #ifndef smallint_type /* if arch didn't override it in bits/wordsize.h */
 #define smallint_type int
 #endif
diff --git a/libc/sysdeps/linux/i386/bits/wordsize.h b/libc/sysdeps/linux/i386/bits/wordsize.h
index 7c3cd9c..f4c2144 100644
--- a/libc/sysdeps/linux/i386/bits/wordsize.h
+++ b/libc/sysdeps/linux/i386/bits/wordsize.h
@@ -18,7 +18,7 @@
 
 #define __WORDSIZE	32
 
-#ifdef UCLIBC_INTERNAL
+#ifdef _LIBC
 #ifndef smallint_type
 #define smallint_type char
 #endif
-- 
1.6.3.3