Tidy up the 64-bit (and socklen_t) type probing.

p4raw-id: //depot/metaconfig@5243

diff --git a/U/modified/d_longdbl.U b/U/modified/d_longdbl.U
index b4b9cfd..2f4749f 100644 (file)
--- a/U/modified/d_longdbl.U
+++ b/U/modified/d_longdbl.U
@@ -37,16 +37,14 @@
 ?F:!try
 : check for long doubles
 echo " "
-$echo $n "Checking to see if your system supports long double..." $c >&4
+echo "Checking to see if you have long double..." >&4
 echo 'int main() { long double x = 7.0; }' > try.c
 set try
 if eval $compile; then
        val="$define"
-       echo " " >&4
        echo "You have long double."
 else
        val="$undef"
-       echo " " >&4
        echo "You do not have long double."
 fi
 $rm try.*

diff --git a/U/modified/d_longlong.U b/U/modified/d_longlong.U
index 2ef603c..b8a565f 100644 (file)
--- a/U/modified/d_longlong.U
+++ b/U/modified/d_longlong.U
@@ -36,16 +36,14 @@
 ?F:!try
 : check for long long
 echo " "
-$echo $n "Checking to see if your system supports long long..." $c >&4
+echo "Checking to see if you have long long..." >&4
 echo 'int main() { long long x = 7; return 0; }' > try.c
 set try
 if eval $compile; then
        val="$define"
-       echo " " >&4
        echo "You have have long long."
 else
        val="$undef"
-       echo " " >&4
        echo "You do not have long long."
 fi
 $rm try.*

diff --git a/U/perl/d_fpos64_t.U b/U/perl/d_fpos64_t.U
new file mode 100644 (file)
index 0000000..cbd4a82
--- /dev/null
+++ b/U/perl/d_fpos64_t.U
@@ -0,0 +1,42 @@
+?RCS: $Id$
+?RCS:
+?RCS: Copyright (c) 2000 Jarkko Hietaniemi
+?RCS:
+?RCS: You may distribute under the terms of either the GNU General Public
+?RCS: License or the Artistic License, as specified in the README file.
+?RCS:
+?MAKE:d_fpos64_t: \
+       Inlibc Setvar Compile rm cat fpossize
+?MAKE: -pick add $@ %<
+?S:d_fpos64_t:
+?S:    This symbol will be defined if the C compiler supports fpos64_t.
+?S:.
+?C:HAS_FPOS64_T:
+?C:    This symbol will be defined if the C compiler supports fpos64_t.
+?C:.
+?H:#$d_fpos64_t        HAS_FPOS64_T            /**/
+?H:.
+?LINT:set d_fpos64_t
+
+: check for fpos64_t
+echo " "
+echo "Checking to see if you have fpos64_t..." >&4
+$cat >try.c <<EOCP
+#include <stdio.h>
+int main() { fpos64_t x = 7; }
+EOCP
+set try
+if eval $compile; then
+       val="$define"
+       echo "You have fpos64_t."
+else
+       val="$undef"
+       echo "You do not have fpos64_t."
+       case "$fpossize" in
+       8) echo "(Your fpos_t is 64 bits, so you could use that.)" ;;
+       esac
+fi
+$rm -f try.* try
+set d_fpos64_t
+eval $setvar
+

diff --git a/U/perl/d_int64_t.U b/U/perl/d_int64_t.U
index 99a40bf..a76c59c 100644 (file)
--- a/U/perl/d_int64_t.U
+++ b/U/perl/d_int64_t.U
@@ -8,7 +8,7 @@
 ?RCS: that same Artistic Licence; a copy of which may be found at the root
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
-?MAKE:d_int64_t: Inhdr echo n c cat rm Setvar Compile i_inttypes
+?MAKE:d_int64_t: Inhdr cat rm Setvar Compile i_inttypes
 ?MAKE: -pick add $@ %<
 ?S:d_int64_t:
 ?S:     This symbol will be defined if the C compiler supports int64_t.
@@ -23,7 +23,7 @@
 ?LINT:set d_int64_t
 : check for int64_t
 echo " "
-$echo $n "Checking to see if your system supports int64_t...$c" >&4
+echo "Checking to see if you have int64_t..." >&4
 $cat >try.c <<EOCP
 #include <sys/types.h>
 #$i_inttypes I_INTTYPES
@@ -35,11 +35,9 @@ EOCP
 set try
 if eval $compile; then
        val="$define"
-       echo " " >&4
        echo "You have int64_t."
 else
        val="$undef"
-       echo " " >&4
        echo "You do not have int64_t."
 fi
 $rm -f try try.*

diff --git a/U/perl/d_off64_t.U b/U/perl/d_off64_t.U
new file mode 100644 (file)
index 0000000..0c2680f
--- /dev/null
+++ b/U/perl/d_off64_t.U
@@ -0,0 +1,43 @@
+?RCS: $Id$
+?RCS:
+?RCS: Copyright (c) 1998 Jarkko Hietaniemi
+?RCS:
+?RCS: You may distribute under the terms of either the GNU General Public
+?RCS: License or the Artistic License, as specified in the README file.
+?RCS:
+?MAKE:d_off64_t: \
+       Inlibc Setvar Compile rm cat lseeksize
+?MAKE: -pick add $@ %<
+?S:d_off64_t:
+?S:    This symbol will be defined if the C compiler supports off64_t.
+?S:.
+?C:HAS_OFF64_T:
+?C:    This symbol will be defined if the C compiler supports off64_t.
+?C:.
+?H:#$d_off64_t HAS_OFF64_T             /**/
+?H:.
+?LINT:set d_off64_t
+
+: check for off64_t
+echo " "
+echo "Checking to see if you have off64_t..." >&4
+$cat >try.c <<EOCP
+#include <sys/types.h>
+#include <unistd.h>
+int main() { off64_t x = 7; }
+EOCP
+set try
+if eval $compile; then
+       val="$define"
+       echo "You have off64_t."
+else
+       val="$undef"
+       echo "You do not have off64_t."
+       case "$lseeksize" in
+       8) echo "(Your off_t is 64 bits, so you could use that.)" ;;
+       esac
+fi
+$rm -f try.* try
+set d_off64_t
+eval $setvar
+

diff --git a/U/perl/d_socklen_t.U b/U/perl/d_socklen_t.U
index e480a3a..5005c1c 100644 (file)
--- a/U/perl/d_socklen_t.U
+++ b/U/perl/d_socklen_t.U
@@ -8,7 +8,7 @@
 ?RCS: that same Artistic Licence; a copy of which may be found at the root
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
-?MAKE:d_socklen_t: Inhdr echo n c cat rm Setvar Compile d_socket
+?MAKE:d_socklen_t: Inhdr cat rm Setvar Compile d_socket sizetype
 ?MAKE: -pick add $@ %<
 ?S:d_socklen_t:
 ?S:     This symbol will be defined if the C compiler supports socklen_t.
@@ -22,7 +22,7 @@
 ?LINT:set d_socklen_t
 : check for socklen_t
 echo " "
-$echo $n "Checking to see if your system supports socklen_t...$c" >&4
+echo "Checking to see if you have socklen_t..." >&4
 $cat >try.c <<EOCP
 #include <sys/types.h>
 #$d_socket HAS_SOCKET
@@ -34,12 +34,13 @@ EOCP
 set try
 if eval $compile; then
        val="$define"
-       echo " " >&4
        echo "You have socklen_t."
 else
        val="$undef"
-       echo " " >&4
        echo "You do not have socklen_t."
+       case "$sizetype" in
+       size_t) echo "(You do have size_t, that might work.)" ;;
+       esac
 fi
 $rm -f try try.*
 set d_socklen_t

diff --git a/U/perl/io64.U b/U/perl/io64.U
deleted file mode 100644 (file)
index e536818..0000000
--- a/U/perl/io64.U
+++ /dev/null
@@ -1,73 +0,0 @@
-?RCS: $Id$
-?RCS:
-?RCS: Copyright (c) 1998 Jarkko Hietaniemi
-?RCS:
-?RCS: You may distribute under the terms of either the GNU General Public
-?RCS: License or the Artistic License, as specified in the README file.
-?RCS:
-?MAKE:d_fpos64_t d_off64_t: \
-       Inlibc Setvar Compile rm cat lseeksize fpossize
-?MAKE: -pick add $@ %<
-?S:d_off64_t:
-?S:    This symbol will be defined if the C compiler supports off64_t.
-?S:.
-?S:d_fpos64_t:
-?S:    This symbol will be defined if the C compiler supports fpos64_t.
-?S:.
-?C:HAS_OFF64_T:
-?C:    This symbol will be defined if the C compiler supports off64_t.
-?C:.
-?C:HAS_FPOS64_T:
-?C:    This symbol will be defined if the C compiler supports fpos64_t.
-?C:.
-?H:#$d_off64_t HAS_OFF64_T             /**/
-?H:#$d_fpos64_t        HAS_FPOS64_T            /**/
-?H:.
-?LINT:set d_off64_t
-?LINT:set d_fpos64_t
-
-: check for off64_t
-echo " "
-echo "Checking to see if your system supports off64_t..." >&4
-$cat >try.c <<EOCP
-#include <sys/types.h>
-#include <unistd.h>
-int main() { off64_t x = 7; }
-EOCP
-set try
-if eval $compile; then
-       val="$define"
-       echo "Yes, it does."
-else
-       val="$undef"
-       echo "No, it doesn't."
-       case "$lseeksize" in
-       8) echo "(Your off_t is 64 bits, so you could use that.)" ;;
-       esac
-fi
-$rm -f try.* try
-set d_off64_t
-eval $setvar
-
-: check for fpos64_t
-echo " "
-echo "Checking to see if your system supports fpos64_t..." >&4
-$cat >try.c <<EOCP
-#include <stdio.h>
-int main() { fpos64_t x = 7; }
-EOCP
-set try
-if eval $compile; then
-       val="$define"
-       echo "Yes, it does."
-else
-       val="$undef"
-       echo "No, it doesn't."
-       case "$fpossize" in
-       8) echo "(Your fpos_t is 64 bits, so you could use that.)" ;;
-       esac
-fi
-$rm -f try.* try
-set d_fpos64_t
-eval $setvar
-