diff -d -urpN uClibc.2/docs/defines.txt uClibc.3/docs/defines.txt --- uClibc.2/docs/defines.txt 2009-06-27 00:46:19.000000000 +0200 +++ uClibc.3/docs/defines.txt 2009-07-21 16:31:34.378128126 +0200 @@ -1,5 +1,5 @@ Feeble attempt to document the horde of #defines we deal with. -Editors, plese make your descriptions short but informative. +Editors, please make your descriptions short but informative. @@ -56,11 +56,8 @@ internal_function int internal_function func(params) { body } _LIBC -UCLIBC_INTERNAL - Defined only at libc build time. _LIBC is probably from glibc, -and UCLIBC_INTERNAL is added by vda (he didn't know about _LIBC). -Both defines are physically deleted from headers (using unifdef tool) -in installed headers ("make install"). + Defined only at libc build time. It is physically deleted +from the headers (using unifdef tool) in installed headers ("make install"). __UCLIBC_XXX uclibc-internal and uclibc-specific defines. In particular: diff -d -urpN uClibc.2/extra/scripts/install_headers.sh uClibc.3/extra/scripts/install_headers.sh --- uClibc.2/extra/scripts/install_headers.sh 2009-06-27 00:46:20.000000000 +0200 +++ uClibc.3/extra/scripts/install_headers.sh 2009-07-21 16:12:09.134128031 +0200 @@ -52,7 +52,6 @@ while read -r filename; do # Do not abort the script if unifdef "fails"! # NB2: careful with sed command arguments, they contain tab character "$top_builddir/extra/scripts/unifdef" \ - -UUCLIBC_INTERNAL \ -U_LIBC \ -U__UCLIBC_GEN_LOCALE \ -U__NO_CTYPE \ diff -d -urpN uClibc.2/include/features.h uClibc.3/include/features.h --- uClibc.2/include/features.h 2009-07-21 14:02:17.000000000 +0200 +++ uClibc.3/include/features.h 2009-07-21 16:10:22.777127984 +0200 @@ -34,7 +34,7 @@ #define __need_uClibc_config_h #include #undef __need_uClibc_config_h -#ifdef UCLIBC_INTERNAL +#ifdef _LIBC #include #endif diff -d -urpN uClibc.2/include/printf.h uClibc.3/include/printf.h --- uClibc.2/include/printf.h 2009-06-27 00:46:20.000000000 +0200 +++ uClibc.3/include/printf.h 2009-07-21 16:12:02.538378112 +0200 @@ -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 -d -urpN uClibc.2/include/rpc/clnt.h uClibc.3/include/rpc/clnt.h --- uClibc.2/include/rpc/clnt.h 2009-06-27 00:46:20.000000000 +0200 +++ uClibc.3/include/rpc/clnt.h 2009-07-21 16:12:15.419128734 +0200 @@ -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 -d -urpN uClibc.2/include/string.h uClibc.3/include/string.h --- uClibc.2/include/string.h 2009-07-21 14:02:17.000000000 +0200 +++ uClibc.3/include/string.h 2009-07-21 16:11:00.730128211 +0200 @@ -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 -d -urpN uClibc.2/include/strings.h uClibc.3/include/strings.h --- uClibc.2/include/strings.h 2009-06-27 00:46:20.000000000 +0200 +++ uClibc.3/include/strings.h 2009-07-21 16:10:48.490128392 +0200 @@ -91,7 +91,7 @@ extern int strncasecmp (__const char *__ __END_DECLS -#ifdef UCLIBC_INTERNAL +#ifdef _LIBC #error " should not be included from libc." #endif diff -d -urpN uClibc.2/include/unistd.h uClibc.3/include/unistd.h --- uClibc.2/include/unistd.h 2009-06-27 00:46:20.000000000 +0200 +++ uClibc.3/include/unistd.h 2009-07-21 16:10:38.729128412 +0200 @@ -908,7 +908,7 @@ extern int sethostname (__const char *__ 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 diff -d -urpN uClibc.2/libc/sysdeps/linux/common/bits/types.h uClibc.3/libc/sysdeps/linux/common/bits/types.h --- uClibc.2/libc/sysdeps/linux/common/bits/types.h 2009-06-27 00:46:20.000000000 +0200 +++ uClibc.3/libc/sysdeps/linux/common/bits/types.h 2009-07-21 16:12:32.955125668 +0200 @@ -29,7 +29,7 @@ #define __need_size_t #include -#ifdef UCLIBC_INTERNAL +#ifdef _LIBC #include #endif @@ -200,7 +200,7 @@ __STD_TYPE __U32_TYPE __socklen_t; #undef __STD_TYPE -#ifdef UCLIBC_INTERNAL +#ifdef _LIBC /* Used in `struct shmid_ds'. */ typedef __kernel_ipc_pid_t __ipc_pid_t; #endif diff -d -urpN uClibc.2/libc/sysdeps/linux/i386/bits/wordsize.h uClibc.3/libc/sysdeps/linux/i386/bits/wordsize.h --- uClibc.2/libc/sysdeps/linux/i386/bits/wordsize.h 2009-06-27 00:46:20.000000000 +0200 +++ uClibc.3/libc/sysdeps/linux/i386/bits/wordsize.h 2009-07-21 16:12:21.802128826 +0200 @@ -18,7 +18,7 @@ #define __WORDSIZE 32 -#ifdef UCLIBC_INTERNAL +#ifdef _LIBC #ifndef smallint_type #define smallint_type char #endif diff -d -urpN uClibc.2/Rules.mak uClibc.3/Rules.mak --- uClibc.2/Rules.mak 2009-07-21 14:02:17.000000000 +0200 +++ uClibc.3/Rules.mak 2009-07-21 16:09:50.456128516 +0200 @@ -58,7 +58,7 @@ AWK = awk STRIP_FLAGS ?= -x -R .note -R .comment ## unused? if yes, remove after 0.9.31 -## 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 @@ -536,10 +536,6 @@ ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS))," CFLAGS += $(subst ",, $(UCLIBC_EXTRA_CFLAGS)) endif -# Please let us see private headers' parts -# Deprecated: _LIBC serves the same purpose -CFLAGS += -DUCLIBC_INTERNAL - # We need this to be checked within libc-symbols.h ifneq ($(HAVE_SHARED),y) CFLAGS += -DSTATIC