Metaconfig unit change for #7962.

p4raw-id: //depot/metaconfig@7963

diff --git a/U/modified/stdchar.U b/U/modified/stdchar.U
index 9b778d6..4530c66 100644 (file)
--- a/U/modified/stdchar.U
+++ b/U/modified/stdchar.U
@@ -12,7 +12,7 @@
 ?RCS: Revision 3.0  1993/08/18  12:09:52  ram
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
-?MAKE:stdchar: contains Findhdr
+?MAKE:stdchar: contains Findhdr cppstdin cppminus rm
 ?MAKE: -pick add $@ %<
 ?S:stdchar:
 ?S:    This variable conditionally defines STDCHAR to be the type of char
@@ -24,25 +24,19 @@
 ?C:.
 ?H:#define STDCHAR $stdchar    /**/
 ?H:.
-?T:stdiohdr
+?F:!stdioh
 : see what type of char stdio uses.
 echo " "
-if $contains 'unsigned.*char.*_ptr;' `./findhdr stdio.h` >/dev/null 2>&1 ; then
+?X: untangle the #include nest
+echo '#include <stdio.h>' | $cppstdin $cppminus > stdioh
+if $contains 'unsigned.*char.*_ptr;' stdioh >/dev/null 2>&1 ; then
        echo "Your stdio uses unsigned chars." >&4
        stdchar="unsigned char"
 else
-       : Solaris 7+, others?
-       stdiohdr=`./findhdr stdio_impl.h`
-       case "$stdiohdr" in
-       '') ;;
-       *)      if $contains 'unsigned.*char.*_ptr;' $stdiohdr >/dev/null 2>&1 ; then
-                       echo "Your stdio uses unsigned chars." >&4
-                       stdchar="unsigned char"
-               else
-                       echo "Your stdio uses signed chars." >&4
-                       stdchar="char"
-               fi
-               ;;
-       esac
+       echo "Your stdio uses signed chars." >&4
+       stdchar="char"
 fi
+$rm -f stdioh
+
+