From 4a2724d93bcd8626f2cebead9b263b4f9f86541d Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 21 Jul 2009 20:09:13 +0200
Subject: s/UCLIBC_INTERNAL/_LIBC/g

Undo my old mistake. I added UCLIBC_INTERNAL define,
but later I realized _LIBC is doing exactly the same thing.

This change converts all usages of UCLIBC_INTERNAL to _LIBC,
removing all instances of UCLIBC_INTERNAL.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 include/features.h | 2 +-
 include/printf.h   | 8 ++++----
 include/rpc/clnt.h | 2 +-
 include/string.h   | 2 +-
 include/strings.h  | 2 +-
 include/unistd.h   | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/features.h b/include/features.h
index 16ed44cba..66447e2ed 100644
--- a/include/features.h
+++ b/include/features.h
@@ -34,7 +34,7 @@
 #define __need_uClibc_config_h
 #include <bits/uClibc_config.h>
 #undef __need_uClibc_config_h
-#ifdef UCLIBC_INTERNAL
+#ifdef _LIBC
 #include <bits/uClibc_arch_features.h>
 #endif
 
diff --git a/include/printf.h b/include/printf.h
index 72dffaab4..685e31e1f 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 (i.e. if _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/rpc/clnt.h b/include/rpc/clnt.h
index 0dcadcb5a..608c7e7d3 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -133,7 +133,7 @@ typedef struct CLIENT CLIENT;
 struct CLIENT {
   AUTH	*cl_auth;		 /* authenticator */
   /* not sure whether non-const-ness is a part of the spec... if it is,
-   * enclose "const" in #ifdef UCLIBC_INTERNAL / #endif
+   * enclose "const" in #ifdef _LIBC / #endif
    * to make it effective only for libc compile */
   const
   struct clnt_ops {
diff --git a/include/string.h b/include/string.h
index 1d7a4a876..ca22055ed 100644
--- a/include/string.h
+++ b/include/string.h
@@ -483,7 +483,7 @@ libc_hidden_proto(strlcpy)
 __END_DECLS
 
 
-#if defined(UCLIBC_INTERNAL) && defined(__UCLIBC_HAS_STRING_ARCH_OPT__)
+#if defined(_LIBC) && defined(__UCLIBC_HAS_STRING_ARCH_OPT__)
 # if defined __i386__
 #  include <../libc/string/i386/string.h>
 # endif
diff --git a/include/strings.h b/include/strings.h
index 550f4ab9c..7f3a456d8 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/unistd.h b/include/unistd.h
index 71c1934db..5d3a4cb8f 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -908,7 +908,7 @@ extern int sethostname (__const char *__name, size_t __len)
    This call is restricted to the super-user.  */
 extern int sethostid (long int __id) __THROW __wur;
 
-#if defined __UCLIBC_BSD_SPECIFIC__ || defined UCLIBC_INTERNAL
+#if defined __UCLIBC_BSD_SPECIFIC__ || defined _LIBC
 /* Get and set the NIS (aka YP) domain name, if any.
    Called just like `gethostname' and `sethostname'.
    The NIS domain name is usually the empty string when not using NIS.  */
@@ -1174,7 +1174,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
-- 
cgit v1.2.3