diff options
| author | H.Merijn Brand <h.m.brand@xs4all.nl> | 2008-02-15 16:41:12 +0000 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2008-02-15 16:41:12 +0000 |
| commit | 4137585d161068477223a004b005a7b78ff03d8e (patch) | |
| tree | f19ac266f8767ff2f3c7abb8de8c2b77d9822bf1 | |
| parent | f16e9d76b4f2d50c552a4b696d3664ca265b9771 (diff) | |
| download | perl-4137585d161068477223a004b005a7b78ff03d8e.tar.gz | |
Resync with metaconfig. Escape the last ~.
p4raw-id: //depot/perl@33321
| -rwxr-xr-x | Configure | 6 | ||||
| -rw-r--r-- | Porting/Glossary | 8 | ||||
| -rw-r--r-- | config_h.SH | 9 |
3 files changed, 11 insertions, 12 deletions
@@ -25,7 +25,7 @@ # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Tue Jan 22 17:46:32 CET 2008 [metaconfig 3.0 PL70] +# Generated on Fri Feb 15 17:37:37 CET 2008 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -1057,8 +1057,8 @@ i8size='' i8type='' ivsize='' ivtype='' -nv_preserves_uv_bits='' nv_overflows_integers_at='' +nv_preserves_uv_bits='' nvsize='' nvtype='' u16size='' @@ -3592,7 +3592,7 @@ case "\$1" in \~/*|\~) echo \$1 | $sed "s|~|\${HOME-\$LOGDIR}|" ;; - ~*) + \~*) if $test -f /bin/csh; then /bin/csh -f -c "glob \$1" failed=\$? diff --git a/Porting/Glossary b/Porting/Glossary index 42d75a14ef..a3f2ad1a51 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -3795,15 +3795,15 @@ nroff (Loc.U): full pathname (if any) of the nroff program. After Configure runs, the value is reset to a plain "nroff" and is not useful. -nv_preserves_uv_bits (perlxv.U): - This variable indicates how many of bits type uvtype - a variable nvtype can preserve. - nv_overflows_integers_at (perlxv.U): This variable gives the largest integer value that NVs can hold as a constant floating point expression. If it could not be determined, it holds the value 0. +nv_preserves_uv_bits (perlxv.U): + This variable indicates how many of bits type uvtype + a variable nvtype can preserve. + nveformat (perlxvf.U): This variable contains the format string used for printing a Perl NV using %e-ish floating point format. diff --git a/config_h.SH b/config_h.SH index 47604e9660..20e74506af 100644 --- a/config_h.SH +++ b/config_h.SH @@ -957,19 +957,16 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un #if $cpp_stuff == 1 #define CAT2(a,b) a/**/b #define STRINGIFY(a) "a" - /* If you can get stringification with catify, tell me how! */ #endif #if $cpp_stuff == 42 #define PeRl_CaTiFy(a, b) a ## b #define PeRl_StGiFy(a) #a -/* the additional level of indirection enables these macros to be - * used as arguments to other macros. See K&R 2nd ed., page 231. */ #define CAT2(a,b) PeRl_CaTiFy(a,b) #define StGiFy(a) PeRl_StGiFy(a) #define STRINGIFY(a) PeRl_StGiFy(a) #endif #if $cpp_stuff != 1 && $cpp_stuff != 42 -# include "Bletch: How does this C preprocessor concatenate tokens?" +#include "Bletch: How does this C preprocessor concatenate tokens?" #endif /* CPPSTDIN: @@ -4300,7 +4297,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * This symbol contains the number of bits a variable of type NVTYPE * can preserve of a variable of type UVTYPE. */ -/* NV_OVERFLOWS_INTEGERS_AT +/* NV_OVERFLOWS_INTEGERS_AT: * This symbol gives the largest integer value that NVs can hold. This * value + 1.0 cannot be stored accurately. It is expressed as constant * floating point expression to reduce the chance of decimale/binary @@ -4420,7 +4417,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * Usual values include _iob, __iob, and __sF. */ #$d_stdio_stream_array HAS_STDIO_STREAM_ARRAY /**/ +#ifdef HAS_STDIO_STREAM_ARRAY #define STDIO_STREAM_ARRAY $stdio_stream_array +#endif /* USE_64_BIT_INT: * This symbol, if defined, indicates that 64-bit integers should |