diff options
| -rw-r--r-- | configure.com | 7 | ||||
| -rw-r--r-- | epoc/config.sh | 22 | ||||
| -rw-r--r-- | uconfig.h | 17 | ||||
| -rwxr-xr-x | uconfig.sh | 3 | ||||
| -rw-r--r-- | vos/config.def | 12 | ||||
| -rw-r--r-- | vos/config.h | 60 | ||||
| -rwxr-xr-x | vos/config_h.SH_orig | 76 | ||||
| -rw-r--r-- | win32/config.bc | 3 | ||||
| -rw-r--r-- | win32/config.gc | 3 | ||||
| -rw-r--r-- | win32/config.vc | 3 | ||||
| -rw-r--r-- | win32/config_H.bc | 15 | ||||
| -rw-r--r-- | win32/config_H.gc | 15 | ||||
| -rw-r--r-- | win32/config_H.vc | 15 |
13 files changed, 204 insertions, 47 deletions
diff --git a/configure.com b/configure.com index f8a1b8a68e..c3cba130a4 100644 --- a/configure.com +++ b/configure.com @@ -4476,6 +4476,10 @@ $ ivdformat="""ld""" $ uvuformat="""lu""" $ uvoformat="""lo""" $ uvxformat="""lx""" +$! uselongdouble? +$ nveformat="""e""" +$ nvfformat="""f""" +$ nvgformat="""g""" $! $! Finally the composite ones. All config $! @@ -4982,6 +4986,9 @@ $ WC "netdb_hlen_type='" + netdb_hlen_type + "'" $ WC "netdb_host_type='" + netdb_host_type + "'" $ WC "netdb_name_type='" + netdb_name_type + "'" $ WC "netdb_net_type='" + netdb_net_type + "'" +$ WC "nveformat='" + nveformat + "'" +$ WC "nvfformat='" + nvfformat + "'" +$ WC "nvgformat='" + nvgformat + "'" $ WC "nvsize='" + nvsize + "'" $ WC "nvtype='" + nvtype + "'" $ WC "o_nonblock=' '" diff --git a/epoc/config.sh b/epoc/config.sh index 5b37e3a7dd..51e95eeb99 100644 --- a/epoc/config.sh +++ b/epoc/config.sh @@ -33,8 +33,8 @@ apirevision='' apisubversion='' apiversion='' ar='arm-pe-ar' -archlib='/perl/lib/5.6.1/epoc' -archlibexp='/perl/lib/5.6.1/epoc' +archlib='/perl/lib/5.7.0/epoc' +archlibexp='/perl/lib/5.7.0/epoc' archname64='' archname='epoc' archobjs='epoc.o epocish.o epoc_stubs.o' @@ -295,6 +295,7 @@ d_setpent='undef' d_setpgid='undef' d_setpgrp2='undef' d_setpgrp='undef' +d_setproctitle='undef' d_setprior='undef' d_setpwent='undef' d_setregid='undef' @@ -422,6 +423,7 @@ i_grp='undef' i_iconv='undef' i_ieeefp='undef' i_inttypes='undef' +i_libutil='undef' i_limits='define' i_locale='undef' i_machcthr='undef' @@ -587,8 +589,8 @@ pmake='' pr='' prefix='' prefixexp='' -privlib='/perl/lib/5.6.1' -privlibexp='/perl/lib/5.6.1' +privlib='/perl/lib/5.7.0' +privlibexp='/perl/lib/5.7.0' prototype='define' ptrsize='4' randbits='31' @@ -632,11 +634,11 @@ sig_name_init='"ZERO", 0' sig_num='0' sig_num_init='0, 0' signal_t='void' -sitearch='/perl/lib/site_perl/5.6.1/epoc' -sitearchexp='/perl/lib/site_perl/5.6.1/epoc' -sitelib='/perl/lib/site_perl/5.6.1/' +sitearch='/perl/lib/site_perl/5.7.0/epoc' +sitearchexp='/perl/lib/site_perl/5.7.0/epoc' +sitelib='/perl/lib/site_perl/5.7.0/' sitelib_stem='/perl/lib/site_perl' -sitelibexp='/perl/lib/site_perl/5.6.1/' +sitelibexp='/perl/lib/site_perl/5.7.0/' siteprefix='' siteprefixexp='' sizesize='4' @@ -708,7 +710,7 @@ vendorlib_stem='' vendorlibexp='' vendorprefix='' vendorprefixexp='' -version='5.6.1' +version='5.7.0' vi='' voidflags='15' xlibpth='' @@ -838,7 +840,7 @@ vendorlib_stem='' vendorlibexp='' vendorprefix='' vendorprefixexp='' -version='5.6.0' +version='5.7.0' vi='' voidflags='15' xlibpth='' @@ -2728,12 +2728,27 @@ */ /* UVxf: * This symbol defines the format string used for printing a Perl UV - * as an unsigned hexadecimal integer. + * as an unsigned hexadecimal integer in lowercase abcdef. + */ +/* NVef: + * This symbol defines the format string used for printing a Perl NV + * using %e-ish floating point format. + */ +/* NVff: + * This symbol defines the format string used for printing a Perl NV + * using %f-ish floating point format. + */ +/* NVgf: + * This symbol defines the format string used for printing a Perl NV + * using %g-ish floating point format. */ #define IVdf "ld" /**/ #define UVuf "lu" /**/ #define UVof "lo" /**/ #define UVxf "lx" /**/ +#define NVef "e" /**/ +#define NVff "f" /**/ +#define NVgf "g" /**/ /* Pid_t: * This symbol holds the type used to declare process ids in the kernel. diff --git a/uconfig.sh b/uconfig.sh index f8c5062e1e..a363f507c2 100755 --- a/uconfig.sh +++ b/uconfig.sh @@ -429,6 +429,9 @@ netdb_host_type='const char *' netdb_name_type='const char *' netdb_net_type='unsigned long' nroff='nroff' +nveformat='"e"' +nvfformat='"f"' +nvgformat='"g"' nvsize='8' nvtype='double' o_nonblock='O_NONBLOCK' diff --git a/vos/config.def b/vos/config.def index 1ef1effe84..e0fbeb404e 100644 --- a/vos/config.def +++ b/vos/config.def @@ -208,6 +208,7 @@ $d_setpgid='undef' $d_setpgrp2='undef' $d_setpgrp='undef' $d_setprior='undef' +$d_setproctitle='undef' $d_setpwent='undef' $d_setregid='undef' $d_setresgid='undef' @@ -312,6 +313,7 @@ $i_grp='undef' $i_iconv='undef' $i_ieeefp='undef' $i_inttypes='undef' +$i_libutil='undef' $i_limits='define' $i_locale='define' $i_machcthr='undef' @@ -390,6 +392,10 @@ $netdb_hlen_type='int' $netdb_host_type='char *' $netdb_name_type='char *' $netdb_net_type='long' +$nveformat='"e"' +$nvfformat='"f"' +$nvgformat='"g"' +$nvsize='8' $nvtype='double' $o_nonblock='O_NONBLOCK' $old_pthread_create_joinable='' @@ -397,9 +403,9 @@ $osname='VOS' $otherlibdirs='' $package='perl5' $pidtype='pid_t' -$pm_apiversion='5.00563' -$privlib='/system/ported/perl/lib/5.005' -$privlibexp='/system/ported/perl/lib/5.005' +$pm_apiversion='5.005' +$privlib='/system/ported/perl/lib/5.7' +$privlibexp='/system/ported/perl/lib/5.7' $prototype='define' $ptrsize='4' $quadkind='_error_' diff --git a/vos/config.h b/vos/config.h index 47942251ce..bf0d1fd1e8 100644 --- a/vos/config.h +++ b/vos/config.h @@ -1,11 +1,11 @@ /* * This file was produced by running the config_h.SH script, which - * gets its values from config.sh, which is generally produced by + * gets its values from $CONFIG_SH, which is generally produced by * running Configure. * * Feel free to modify any of this as the need arises. Note, however, * that running config_h.SH again will wipe out any changes you've made. - * For a more permanent change edit config.sh and rerun config_h.SH. + * For a more permanent change edit $CONFIG_SH and rerun config_h.SH. * * \$Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $ */ @@ -1180,18 +1180,18 @@ * This macro surrounds its token with double quotes. */ #if 42 == 1 -# define CAT2(a,b) a/**/b -# define STRINGIFY(a) "a" +#define CAT2(a,b) a/**/b +#define STRINGIFY(a) "a" /* If you can get stringification with catify, tell me how! */ #endif #if 42 == 42 -# define PeRl_CaTiFy(a, b) a ## b -# define PeRl_StGiFy(a) #a +#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) +#define CAT2(a,b) PeRl_CaTiFy(a,b) +#define StGiFy(a) PeRl_StGiFy(a) +#define STRINGIFY(a) PeRl_StGiFy(a) #endif #if 42 != 1 && 42 != 42 # include "Bletch: How does this C preprocessor catenate tokens?" @@ -1858,6 +1858,12 @@ */ #define HAS_SETPROTOENT /**/ +/* HAS_SETPROCTITLE: + * This symbol, if defined, indicates that the setproctitle routine is + * available to set process title. + */ +/*#define HAS_SETPROCTITLE /**/ + /* HAS_SETPWENT: * This symbol, if defined, indicates that the setpwent routine is * available for initializing sequential access of the passwd database. @@ -2675,6 +2681,10 @@ * This symbol, if defined, indicates that a variable of type NVTYPE * can preserve all the bits of a variable of type UVTYPE. */ +/* NV_PRESERVES_UV_BITS: + * This symbol contains the number of bits a variable of type NVTYPE + * can preserve of a variable of type UVTYPE. + */ #define IVTYPE int /**/ #define UVTYPE unsigned int /**/ #define I8TYPE char /**/ @@ -2700,8 +2710,9 @@ #define I64SIZE _error_ /**/ #define U64SIZE _error_ /**/ #endif -#define NVSIZE $nvsize /**/ +#define NVSIZE 8 /**/ #define NV_PRESERVES_UV +#define NV_PRESERVES_UV_BITS 32 /* IVdf: * This symbol defines the format string used for printing a Perl IV @@ -2717,12 +2728,27 @@ */ /* UVxf: * This symbol defines the format string used for printing a Perl UV - * as an unsigned hexadecimal integer. + * as an unsigned hexadecimal integer in lowercase abcdef. + */ +/* NVef: + * This symbol defines the format string used for printing a Perl NV + * using %e-ish floating point format. + */ +/* NVff: + * This symbol defines the format string used for printing a Perl NV + * using %f-ish floating point format. + */ +/* NVgf: + * This symbol defines the format string used for printing a Perl NV + * using %g-ish floating point format. */ #define IVdf "d" /**/ #define UVuf "u" /**/ #define UVof "o" /**/ #define UVxf "x" /**/ +#define NVef "e" /**/ +#define NVff "f" /**/ +#define NVgf "g" /**/ /* Pid_t: * This symbol holds the type used to declare process ids in the kernel. @@ -2741,8 +2767,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "/system/ported/perl/lib/5.005" /**/ -#define PRIVLIB_EXP "/system/ported/perl/lib/5.005" /**/ +#define PRIVLIB "/system/ported/perl/lib/5.7" /**/ +#define PRIVLIB_EXP "/system/ported/perl/lib/5.7" /**/ /* PTRSIZE: * This symbol contains the size of a pointer, so that the C preprocessor @@ -3119,6 +3145,12 @@ * See the INSTALL file for how this works. */ #define PERL_XS_APIVERSION "5.00563" -#define PERL_PM_APIVERSION "5.00563" +#define PERL_PM_APIVERSION "5.005" + +/* I_LIBUTIL: + * This symbol, if defined, indicates that <libutil.h> exists and + * should be included. + */ +/*#define I_LIBUTIL /**/ #endif diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig index 1781def436..c186dfd850 100755 --- a/vos/config_h.SH_orig +++ b/vos/config_h.SH_orig @@ -1,29 +1,35 @@ +case "$CONFIG_SH" in +'') CONFIG_SH=config.sh ;; +esac +case "$CONFIG_H" in +'') CONFIG_H=config.h ;; +esac case $CONFIG in '') - if test -f config.sh; then TOP=.; - elif test -f ../config.sh; then TOP=..; - elif test -f ../../config.sh; then TOP=../..; - elif test -f ../../../config.sh; then TOP=../../..; - elif test -f ../../../../config.sh; then TOP=../../../..; + if test -f $CONFIG_SH; then TOP=.; + elif test -f ../$CONFIG_SH; then TOP=..; + elif test -f ../../$CONFIG_SH; then TOP=../..; + elif test -f ../../../$CONFIG_SH; then TOP=../../..; + elif test -f ../../../../$CONFIG_SH; then TOP=../../../..; else - echo "Can't find config.sh."; exit 1 + echo "Can't find $CONFIG_SH."; exit 1 fi - . $TOP/config.sh + . $TOP/$CONFIG_SH ;; esac case "$0" in */*) cd `expr X$0 : 'X\(.*\)/'` ;; esac -echo "Extracting config.h (with variable substitutions)" -sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-def!#undef!' +echo "Extracting $CONFIG_H (with variable substitutions)" +sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-def!#undef!' /* * This file was produced by running the config_h.SH script, which - * gets its values from config.sh, which is generally produced by + * gets its values from $CONFIG_SH, which is generally produced by * running Configure. * * Feel free to modify any of this as the need arises. Note, however, * that running config_h.SH again will wipe out any changes you've made. - * For a more permanent change edit config.sh and rerun config_h.SH. + * For a more permanent change edit $CONFIG_SH and rerun config_h.SH. * * \$Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $ */ @@ -1198,18 +1204,18 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- * This macro surrounds its token with double quotes. */ #if $cpp_stuff == 1 -# define CAT2(a,b) a/**/b -# define STRINGIFY(a) "a" +#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 +#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) +#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 catenate tokens?" @@ -1876,6 +1882,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- */ #$d_setpent HAS_SETPROTOENT /**/ +/* HAS_SETPROCTITLE: + * This symbol, if defined, indicates that the setproctitle routine is + * available to set process title. + */ +#$d_setproctitle HAS_SETPROCTITLE /**/ + /* HAS_SETPWENT: * This symbol, if defined, indicates that the setpwent routine is * available for initializing sequential access of the passwd database. @@ -2693,6 +2705,10 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- * This symbol, if defined, indicates that a variable of type NVTYPE * can preserve all the bits of a variable of type UVTYPE. */ +/* NV_PRESERVES_UV_BITS: + * This symbol contains the number of bits a variable of type NVTYPE + * can preserve of a variable of type UVTYPE. + */ #define IVTYPE $ivtype /**/ #define UVTYPE $uvtype /**/ #define I8TYPE $i8type /**/ @@ -2720,6 +2736,7 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- #endif #define NVSIZE $nvsize /**/ #$d_nv_preserves_uv NV_PRESERVES_UV +#define NV_PRESERVES_UV_BITS $d_nv_preserves_uv_bits /* IVdf: * This symbol defines the format string used for printing a Perl IV @@ -2735,12 +2752,27 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- */ /* UVxf: * This symbol defines the format string used for printing a Perl UV - * as an unsigned hexadecimal integer. + * as an unsigned hexadecimal integer in lowercase abcdef. + */ +/* NVef: + * This symbol defines the format string used for printing a Perl NV + * using %e-ish floating point format. + */ +/* NVff: + * This symbol defines the format string used for printing a Perl NV + * using %f-ish floating point format. + */ +/* NVgf: + * This symbol defines the format string used for printing a Perl NV + * using %g-ish floating point format. */ #define IVdf $ivdformat /**/ #define UVuf $uvuformat /**/ #define UVof $uvoformat /**/ #define UVxf $uvxformat /**/ +#define NVef $nveformat /**/ +#define NVff $nvfformat /**/ +#define NVgf $nvgformat /**/ /* Pid_t: * This symbol holds the type used to declare process ids in the kernel. @@ -3139,5 +3171,11 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- #define PERL_XS_APIVERSION "$xs_apiversion" #define PERL_PM_APIVERSION "$pm_apiversion" +/* I_LIBUTIL: + * This symbol, if defined, indicates that <libutil.h> exists and + * should be included. + */ +#$i_libutil I_LIBUTIL /**/ + #endif !GROK!THIS! diff --git a/win32/config.bc b/win32/config.bc index 4bce61b517..fb746c960b 100644 --- a/win32/config.bc +++ b/win32/config.bc @@ -595,6 +595,9 @@ nm_opt='' nm_so_opt='' nonxs_ext='Errno' nroff='' +nveformat='"e"' +nvfformat='"f"' +nvgformat='"g"' nvsize='8' nvtype='double' o_nonblock='O_NONBLOCK' diff --git a/win32/config.gc b/win32/config.gc index 7f6a63ce89..5c5048842e 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -595,6 +595,9 @@ nm_opt='' nm_so_opt='' nonxs_ext='Errno' nroff='' +nveformat='"e"' +nvfformat='"f"' +nvgformat='"g"' nvsize='8' nvtype='double' o_nonblock='O_NONBLOCK' diff --git a/win32/config.vc b/win32/config.vc index 853290db68..8c9e5c01fc 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -595,6 +595,9 @@ nm_opt='' nm_so_opt='' nonxs_ext='Errno' nroff='' +nveformat='"e"' +nvfformat='"f"' +nvgformat='"g"' nvsize='8' nvtype='double' o_nonblock='O_NONBLOCK' diff --git a/win32/config_H.bc b/win32/config_H.bc index 3ed8e0476e..d71db9876c 100644 --- a/win32/config_H.bc +++ b/win32/config_H.bc @@ -2697,10 +2697,25 @@ * This symbol defines the format string used for printing a Perl UV * as an unsigned hexadecimal integer. */ +/* NVef: + * This symbol defines the format string used for printing a Perl NV + * using %e-ish floating point format. + */ +/* NVff: + * This symbol defines the format string used for printing a Perl NV + * using %f-ish floating point format. + */ +/* NVgf: + * This symbol defines the format string used for printing a Perl NV + * using %g-ish floating point format. + */ #define IVdf "ld" /**/ #define UVuf "lu" /**/ #define UVof "lo" /**/ #define UVxf "lx" /**/ +#define NVef "e" /**/ +#define NVff "f" /**/ +#define NVgf "g" /**/ /* Pid_t: * This symbol holds the type used to declare process ids in the kernel. diff --git a/win32/config_H.gc b/win32/config_H.gc index dca79c1401..f943aad908 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -2697,10 +2697,25 @@ * This symbol defines the format string used for printing a Perl UV * as an unsigned hexadecimal integer. */ +/* NVef: + * This symbol defines the format string used for printing a Perl NV + * using %e-ish floating point format. + */ +/* NVff: + * This symbol defines the format string used for printing a Perl NV + * using %f-ish floating point format. + */ +/* NVgf: + * This symbol defines the format string used for printing a Perl NV + * using %g-ish floating point format. + */ #define IVdf "ld" /**/ #define UVuf "lu" /**/ #define UVof "lo" /**/ #define UVxf "lx" /**/ +#define NVef "e" /**/ +#define NVff "f" /**/ +#define NVgf "g" /**/ /* Pid_t: * This symbol holds the type used to declare process ids in the kernel. diff --git a/win32/config_H.vc b/win32/config_H.vc index cc9264691e..6b8d234f5e 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -2697,10 +2697,25 @@ * This symbol defines the format string used for printing a Perl UV * as an unsigned hexadecimal integer. */ +/* NVef: + * This symbol defines the format string used for printing a Perl NV + * using %e-ish floating point format. + */ +/* NVff: + * This symbol defines the format string used for printing a Perl NV + * using %f-ish floating point format. + */ +/* NVgf: + * This symbol defines the format string used for printing a Perl NV + * using %g-ish floating point format. + */ #define IVdf "ld" /**/ #define UVuf "lu" /**/ #define UVof "lo" /**/ #define UVxf "lx" /**/ +#define NVef "e" /**/ +#define NVff "f" /**/ +#define NVgf "g" /**/ /* Pid_t: * This symbol holds the type used to declare process ids in the kernel. |