* locale/xlocale.h (struct __locale_struct): New member `__names'.

	* locale/xlocale.c (_nl_C_locobj): Update initializer.
	* locale/global-locale.c (_nl_global_locale): Likewise.
	* locale/duplocale.c (__duplocale): strdup __names elements.
	* locale/freelocale.c (__freelocale): Free __names elements.
	* locale/localename.c (_nl_current_names): Variable removed.
	(__current_locale_name): Use _NL_CURRENT_LOCALE->__names instead.
	* locale/localeinfo.h (_nl_current_names): Removed decl.
	* locale/setlocale.c: Use _nl_global_locale->__names in place of
	_nl_current_names throughout.

	* locale/setlocale.c (setlocale): strdup -> __strdup (not ISO C).

	* sysdeps/gnu/errlist-compat.awk: Emit link_warnings for sys_errlist
	and sys_nerr in the output file.

	* sunrpc/Makefile (rpcgen-cmd): Pass CPP in rpcgen's environment.
	* scripts/cpp: Just use the environment variable.

	* libio/tst-mmap-setvbuf.c (main): Use 'm' fopen flag.
	* libio/tst-mmap-offend.c (do_test): Likewise.
	* libio/tst-mmap-fflushsync.c (do_test): Likewise.
	* libio/tst-mmap-eofsync.c (do_test): Likewise.
	* libio/tst-mmap2-eofsync.c (do_test): Likewise.

1 files changed, 4 insertions, 20 deletions

diff --git a/scripts/cpp b/scripts/cpp
index 24112c663c..65f273ee48 100755
--- a/scripts/cpp
+++ b/scripts/cpp
@@ -1,22 +1,6 @@
 #! /bin/sh
-cpp=`which cpp 2>/dev/null`
-if test $? -ne 0; then
-  if type cpp 2>/dev/null >/dev/null; then
-    cpp=`type cpp 2>/dev/null | awk '{ print $NF }'`
-  else
-    cpp=`gcc -print-file-name=cpp 2>/dev/null`
-    if test $? -ne 0; then
-      if test -x /lib/cpp; then
-        cpp=/lib/cpp
-      else
-        echo "cpp not found" 1>&2
-        exit 1
-      fi
-    fi
-  fi
-fi
 
-exec $cpp $*
-Local Variables:
-mode: sh
-End:
+# This script is used solely by rpcgen when run by sunrpc/Makefile,
+# which passes CPP in the environment to tell us what to run.
+
+exec ${CPP} "$@"