Account for GNU "i" extension when checking 'nm' output.

Add the new static_inline stuff to the "other" config files too
Add the missing Glossary parts

8 files changed, 30 insertions, 2 deletions

diff --git a/Configure b/Configure
index 94805cbca8..093984f2be 100755
--- a/Configure
+++ b/Configure
@@ -30,7 +30,7 @@
 
 # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $
 #
-# Generated on Wed Jun 23 16:03:55 CEST 2010 [metaconfig 3.5 PL0]
+# Generated on Thu Aug 12 11:38:08 CEST 2010 [metaconfig 3.5 PL0]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -7674,7 +7674,7 @@ $echo $n ".$c"
 $grep fprintf libc.tmp > libc.ptf
 xscan='eval "<libc.ptf $com >libc.list"; $echo $n ".$c" >&4'
 xrun='eval "<libc.tmp $com >libc.list"; echo "done." >&4'
-xxx='[ADTSIW]'
+xxx='[ADTSIWi]'
 if com="$sed -n -e 's/__IO//' -e 's/^.* $xxx  *//p'";\
 	eval $xscan;\
 	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
diff --git a/NetWare/config.wc b/NetWare/config.wc
index 05a270daa7..ad84370249 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -450,6 +450,7 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
+d_static_inline='undef'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
 d_statvfs='undef'
@@ -829,6 +830,7 @@ perl5=''
 perl='perl'
 perladmin=''
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.nlm'
+perl_static_inline=''
 pg=''
 phostname='hostname'
 pidtype='int'
diff --git a/Porting/Glossary b/Porting/Glossary
index e0df178db8..909d8012ae 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -2153,6 +2153,12 @@ d_statfs_s (d_statfs_s.U):
 	This variable conditionally defines the HAS_STRUCT_STATFS symbol,
 	which indicates that the struct statfs is supported.
 
+d_static_inline (d_static_inline.U):
+	This variable conditionally defines the HAS_STATIC_INLINE symbol,
+	which indicates that the C compiler supports C99-style static
+	inline.  That is, the function can't be called from another
+	translation unit.
+
 d_statvfs (d_statvfs.U):
 	This variable conditionally defines the HAS_STATVFS symbol, which
 	indicates to the C program that the statvfs() routine is available.
@@ -4111,6 +4117,16 @@ PERL_REVISION (Oldsyms.U):
 	In a Perl version number such as 5.6.2, this is the 5.
 	This value is manually set in patchlevel.h
 
+perl_static_inline (d_static_inline.U):
+	This variable defines the PERL_STATIC_INLINE symbol to
+	the best-guess incantation to use for static inline functions.
+	Possibilities include
+	static inline       (c99)
+	static __inline__   (gcc -ansi)
+	static __inline     (MSVC)
+	static _inline      (older MSVC)
+	static              (c89 compilers)
+
 PERL_SUBVERSION (Oldsyms.U):
 	In a Perl version number such as 5.6.2, this is the 2.
 	Values greater than 50 represent potentially unstable
diff --git a/win32/config.bc b/win32/config.bc
index 8c5e41a0b9..612a1ee1f5 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -447,6 +447,7 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
+d_static_inline='undef'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
 d_statvfs='undef'
@@ -850,6 +851,7 @@ perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
+perl_static_inline=''
 pg=''
 phostname='hostname'
 pidtype='int'
diff --git a/win32/config.ce b/win32/config.ce
index edfe152611..a86ead1664 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -450,6 +450,7 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
+d_static_inline='undef'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
 d_statvfs='undef'
@@ -821,6 +822,7 @@ perl='perl'
 perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
+perl_static_inline=''
 pg=''
 phostname='hostname'
 pidtype='int'
diff --git a/win32/config.gc b/win32/config.gc
index b9a6893b55..31c1c3f0e1 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -447,6 +447,7 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
+d_static_inline='undef'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
 d_statvfs='undef'
@@ -850,6 +851,7 @@ perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
+perl_static_inline=''
 pg=''
 phostname='hostname'
 pidtype='int'
diff --git a/win32/config.vc b/win32/config.vc
index 8bcd501ec7..afb86cc502 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -447,6 +447,7 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
+d_static_inline='undef'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
 d_statvfs='undef'
@@ -850,6 +851,7 @@ perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
+perl_static_inline=''
 pg=''
 phostname='hostname'
 pidtype='int'
diff --git a/win32/config.vc64 b/win32/config.vc64
index e82627b70d..2314ced088 100644
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -447,6 +447,7 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
+d_static_inline='undef'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
 d_statvfs='undef'
@@ -850,6 +851,7 @@ perl_patchlevel='~PERL_PATCHLEVEL~'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
+perl_static_inline=''
 pg=''
 phostname='hostname'
 pidtype='int'