From: H.Merijn Brand <h.m.brand@xs4all.nl>
Date: Sat, 29 Dec 2007 14:54:57 +0000 (+0000)
Subject: Sync after metaconfig backports. Some reorders were done
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c0bacbefa7e93e425666c0c5f655c48e3ae97edf;p=p5sagit%2Fp5-mst-13.2.git
Sync after metaconfig backports. Some reorders were done
p4raw-id: //depot/perl@32773
---
diff --git a/Configure b/Configure
index d907e04..ce9b74f 100755
--- a/Configure
+++ b/Configure
@@ -26,7 +26,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Mon Oct 8 10:22:27 CEST 2007 [metaconfig 3.0 PL70]
+# Generated on Sat Dec 29 15:53:27 CET 2007 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by perlbug@perl.org)
cat >c1$$ <<EOF
@@ -839,8 +839,8 @@ installhtml1dir=''
html3dir=''
html3direxp=''
installhtml3dir=''
-i_assert=''
i_arpainet=''
+i_assert=''
i_crypt=''
db_hashtype=''
db_prefixtype=''
@@ -5089,7 +5089,7 @@ default|recommended)
case "$gccversion" in
1*) ;;
2.[0-8]*) ;;
- ?*) set strict-aliasing -fno-strict-aliasing
+ ?*) set strict-aliasing -fno-strict-aliasing
eval $checkccflag
;;
esac
@@ -19744,7 +19744,7 @@ else
fi
$rm -f foo* bar*
-: check for type of arguments to select.
+: check for type of arguments to select.
case "$selecttype" in
'') case "$d_select" in
$define)
@@ -19753,7 +19753,7 @@ case "$selecttype" in
Checking to see what type of arguments are accepted by select().
EOM
hdrs="$define sys/types.h
- $i_systime sys/time.h
+ $i_systime sys/time.h
$i_sysselct sys/select.h
$d_socket sys/socket.h"
: The first arg can be int, unsigned, or size_t
@@ -20171,7 +20171,7 @@ echo $sig_name | $awk \
printf "\n"
}'
sig_size=`echo $sig_name | awk '{print NF}'`
-$rm -f signal signal.c signal.awk signal.lst signal_cmd
+$rm -f signal signal.c signal.awk signal.lst signal_cmd
echo " "
case "$sizetype" in
@@ -20516,6 +20516,11 @@ case "$yacc" in
;;
esac
+
+: see if this is a assert.h system
+set assert.h i_assert
+eval $inhdr
+
: see if this is a fp.h system
set fp.h i_fp
eval $inhdr
@@ -20924,10 +20929,6 @@ val=$val3; set i_termios; eval $setvar
set stddef.h i_stddef
eval $inhdr
-: see if assert.h is available
-set assert.h i_assert
-eval $inhdr
-
: see if sys/access.h is available
set sys/access.h i_sysaccess
eval $inhdr
diff --git a/Porting/Glossary b/Porting/Glossary
index 5c35d24..b69d7b9 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -2826,8 +2826,8 @@ i_arpainet (i_arpainet.U):
i_assert (i_assert.U):
This variable conditionally defines the I_ASSERT symbol, which
- indicates to the C program that <assert.h> exists and could
- be included.
+ indicates to the C program that <assert.h> exists and could be
+ included.
i_bsdioctl (i_sysioctl.U):
This variable conditionally defines the I_SYS_BSDIOCTL symbol, which
diff --git a/config_h.SH b/config_h.SH
index 2f955d8..d6cc1fa 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -640,12 +640,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
*/
#$i_arpainet I_ARPA_INET /**/
-/* I_ASSERT:
- * This symbol, if defined, indicates to the C program that it could
- * include <assert.h> to get the assert() macro.
- */
-#$i_assert I_ASSERT /**/
-
/* I_DBM:
* This symbol, if defined, indicates that <dbm.h> exists and should
* be included.
@@ -706,12 +700,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
*/
#$i_memory I_MEMORY /**/
-/* I_NET_ERRNO:
- * This symbol, if defined, indicates that <net/errno.h> exists and
- * should be included.
- */
-#$i_neterrno I_NET_ERRNO /**/
-
/* I_NETINET_IN:
* This symbol, if defined, indicates to the C program that it should
* include <netinet/in.h>. Otherwise, you may try <sys/in.h>.
@@ -1790,7 +1778,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
* doubles.
*/
/* LONG_DOUBLESIZE:
- * This symbol contains the size of a long double, so that the
+ * This symbol contains the size of a long double, so that the
* C preprocessor can make decisions based on it. It is only
* defined if the system supports long doubles.
*/
@@ -1803,7 +1791,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
* This symbol will be defined if the C compiler supports long long.
*/
/* LONGLONGSIZE:
- * This symbol contains the size of a long long, so that the
+ * This symbol contains the size of a long long, so that the
* C preprocessor can make decisions based on it. It is only
* defined if the system supports long long.
*/
@@ -1875,7 +1863,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
#$d_pthread_atfork HAS_PTHREAD_ATFORK /**/
/* HAS_PTHREAD_YIELD:
- * This symbol, if defined, indicates that the pthread_yield
+ * This symbol, if defined, indicates that the pthread_yield
* routine is available to yield the execution of the current
* thread. sched_yield is preferable to pthread_yield.
*/
@@ -2367,8 +2355,8 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
* This symbol holds the type used for the second argument to
* getgroups() and setgroups(). Usually, this is the same as
* gidtype (gid_t) , but sometimes it isn't.
- * It can be int, ushort, gid_t, etc...
- * It may be necessary to include <sys/types.h> to get any
+ * It can be int, ushort, gid_t, etc...
+ * It may be necessary to include <sys/types.h> to get any
* typedef'ed information. This is only required if you have
* getgroups() or setgroups()..
*/
@@ -2425,6 +2413,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
*/
#$i_netdb I_NETDB /**/
+/* I_NET_ERRNO:
+ * This symbol, if defined, indicates that <net/errno.h> exists and
+ * should be included.
+ */
+#$i_neterrno I_NET_ERRNO /**/
+
/* I_PTHREAD:
* This symbol, if defined, indicates to the C program that it should
* include <pthread.h>.
@@ -2557,7 +2551,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
#$d_mymalloc MYMALLOC /**/
/* Mode_t:
- * This symbol holds the type used to declare file modes
+ * This symbol holds the type used to declare file modes
* for systems calls. It is usually mode_t, but may be
* int or unsigned short. It may be necessary to include <sys/types.h>
* to get any typedef'ed information.
@@ -2636,7 +2630,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
/* Select_fd_set_t:
* This symbol holds the type used for the 2nd, 3rd, and 4th
* arguments to select. Usually, this is 'fd_set *', if HAS_FD_SET
- * is defined, and 'int *' otherwise. This is only useful if you
+ * is defined, and 'int *' otherwise. This is only useful if you
* have select(), of course.
*/
#define Select_fd_set_t $selecttype /**/
@@ -2673,10 +2667,10 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
* The signals in the list are separated with commas, and the indices
* within that list and the SIG_NAME list match, so it's easy to compute
* the signal name from a number or vice versa at the price of a small
- * dynamic linear lookup.
+ * dynamic linear lookup.
* Duplicates are allowed, but are moved to the end of the list.
* The signal number corresponding to sig_name[i] is sig_number[i].
- * if (i < NSIG) then sig_number[i] == i.
+ * if (i < NSIG) then sig_number[i] == i.
* The last element is 0, corresponding to the 0 at the end of
* the sig_name_init list.
* Note that this variable is initialized from the sig_num_init,
@@ -2893,11 +2887,11 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
* On NeXT 3.2 (and greater), you can build "Fat" Multiple Architecture
* Binaries (MAB) on either big endian or little endian machines.
* The endian-ness is available at compile-time. This only matters
- * for perl, where the config.h can be generated and installed on
+ * for perl, where the config.h can be generated and installed on
* one system, and used by a different architecture to build an
* extension. Older versions of NeXT that might not have
* defined either *_ENDIAN__ were all on Motorola 680x0 series,
- * so the default case (for NeXT) is big endian to catch them.
+ * so the default case (for NeXT) is big endian to catch them.
* This might matter for NeXT 3.0.
*/
#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
@@ -2985,7 +2979,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
#$d_getpagsz HAS_GETPAGESIZE /**/
/* HAS_GNULIBC:
- * This symbol, if defined, indicates to the C program that
+ * This symbol, if defined, indicates to the C program that
* the GNU C library is being used. A better check is to use
* the __GLIBC__ and __GLIBC_MINOR__ symbols supplied with glibc.
*/
@@ -2994,7 +2988,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
# define _GNU_SOURCE
#endif
/* HAS_ISASCII:
- * This manifest constant lets the C program know that isascii
+ * This manifest constant lets the C program know that isascii
* is available.
*/
#$d_isascii HAS_ISASCII /**/
@@ -4025,6 +4019,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
#$fflushNULL FFLUSH_NULL /**/
#$fflushall FFLUSH_ALL /**/
+/* I_ASSERT:
+ * This symbol, if defined, indicates that <assert.h> exists and
+ * could be included by the C program to get the assert() macro.
+ */
+#$i_assert I_ASSERT /**/
+
/* I_CRYPT:
* This symbol, if defined, indicates that <crypt.h> exists and
* should be included.