26 files changed, 8 insertions, 283 deletions

diff --git a/Configure b/Configure
index 854ed8fbd0..9c893399fb 100755
--- a/Configure
+++ b/Configure
@@ -706,8 +706,6 @@ d_setservent_r=''
 setservent_r_proto=''
 d_setsid=''
 d_setvbuf=''
-d_sfio=''
-usesfio=''
 d_shm=''
 d_shmat=''
 d_shmatprototype=''
@@ -931,7 +929,6 @@ d_pwgecos=''
 d_pwpasswd=''
 d_pwquota=''
 i_pwd=''
-i_sfio=''
 i_shadow=''
 i_socks=''
 i_stdbool=''
@@ -1378,7 +1375,7 @@ libswanted_uselargefiles=''
 : set usesocks on the Configure command line to enable socks.
 : List of libraries we want.
 : If anyone needs extra -lxxx, put those in a hint file.
-libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun"
+libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun"
 libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
 : We probably want to search /usr/shlib before most other libraries.
 : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
@@ -5330,20 +5327,7 @@ if $sh -c "$cc -o try $optimize $ccflags $ldflags try.c $libs" >>try.msg 2>&1; t
 		xxx=`$run ./try`
 		case "$xxx" in
 		"Ok") dflt=n ;;
-		*)	echo 'The program compiled OK, but produced no output.' >> try.msg
-			case " $libs " in
-			*" -lsfio "*)
-				cat >> try.msg <<'EOQS'
-If $libs contains -lsfio, and sfio is mis-configured, then it
-sometimes (apparently) runs and exits with a 0 status, but with no
-output!  It may have to do with sfio's use of _exit vs. exit.
-
-EOQS
-				rp="You have a big problem.  Shall I abort Configure"
-				dflt=y
-				;;
-			esac
-			;;
+		*)    echo 'The program compiled OK, but produced no output.' >> try.msg ;;
 		esac
 	else
 		echo "The program compiled OK, but exited with status $?." >>try.msg
@@ -17421,69 +17405,6 @@ eval $inlibc
 set setvbuf d_setvbuf
 eval $inlibc
 
-: see if sfio.h is available
-set sfio.h i_sfio
-eval $inhdr
-
-: see if sfio library is available
-case "$i_sfio" in
-$define)
-	val=''
-	set sfreserve val
-	eval $inlibc
-	;;
-*)
-	val="$undef"
-	;;
-esac
-: Ok, but do we want to use it.
-case "$val" in
-$define)
-	case "$usesfio" in
-	true|$define|[yY]*) dflt='y';;
-	*) dflt='n';;
-	esac
-	echo "$package can use the sfio library, but it is experimental."
-	rp="You seem to have sfio available, do you want to try using it?"
-	. ./myread
-	case "$ans" in
-	y|Y)	echo "Ok, turning on sfio then."
-		val="$define"
-		;;
-	*)	echo "Ok, avoiding sfio this time.  I'll use stdio instead."
-		val="$undef"
-		;;
-	esac
-	;;
-*)	case "$usesfio" in
-	true|$define|[yY]*)
-		echo "Sorry, cannot find sfio on this machine." >&4
-		echo "Ignoring your setting of usesfio=$usesfio." >&4
-		val="$undef"
-		;;
-	esac
-	;;
-esac
-set d_sfio
-eval $setvar
-case "$d_sfio" in
-$define) usesfio='true';;
-*) usesfio='false';;
-esac
-case "$d_sfio" in
-$define) ;;
-*)	: Remove sfio from list of libraries to use
-	case "$libs" in
-	*-lsfio*)
-		echo "Removing unneeded -lsfio from library list" >&4
-		set `echo X $libs | $sed -e 's/-lsfio / /' -e 's/-lsfio$//'`
-		shift
-		libs="$*"
-		echo "libs = $libs" >&4
-		;;
-	esac
-;;
-esac
 
 
 : see if shmctl exists
@@ -23112,7 +23033,6 @@ d_setsent='$d_setsent'
 d_setservent_r='$d_setservent_r'
 d_setsid='$d_setsid'
 d_setvbuf='$d_setvbuf'
-d_sfio='$d_sfio'
 d_shm='$d_shm'
 d_shmat='$d_shmat'
 d_shmatprototype='$d_shmatprototype'
@@ -23350,7 +23270,6 @@ i_prot='$i_prot'
 i_pthread='$i_pthread'
 i_pwd='$i_pwd'
 i_rpcsvcdbm='$i_rpcsvcdbm'
-i_sfio='$i_sfio'
 i_sgtty='$i_sgtty'
 i_shadow='$i_shadow'
 i_socks='$i_socks'
@@ -23723,7 +23642,6 @@ useperlio='$useperlio'
 useposix='$useposix'
 usereentrant='$usereentrant'
 userelocatableinc='$userelocatableinc'
-usesfio='$usesfio'
 useshrplib='$useshrplib'
 usesitecustomize='$usesitecustomize'
 usesocks='$usesocks'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 0cbf8c0022..d7ea683d83 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -439,7 +439,6 @@ d_setsent='define'
 d_setservent_r='undef'
 d_setsid='define'
 d_setvbuf='define'
-d_sfio='undef'
 d_shm='define'
 d_shmat='define'
 d_shmatprototype='define'
@@ -676,7 +675,6 @@ i_prot='undef'
 i_pthread='define'
 i_pwd='define'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='define'
 i_socks='undef'
@@ -780,7 +778,7 @@ libsdirs=' /usr/lib'
 libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so'
 libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
 libspath=' /usr/local/lib /lib /usr/lib'
-libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD'
 libswanted_uselargefiles=''
 line=''
 lint=''
@@ -1043,7 +1041,6 @@ useperlio='define'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='true'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index e3aaf0b1d1..158252dd61 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -416,7 +416,6 @@ d_setsent='define'
 d_setservent_r='undef'
 d_setsid='define'
 d_setvbuf='define'
-d_sfio='undef'
 d_shm='define'
 d_shmat='define'
 d_shmatprototype='define'
@@ -648,7 +647,6 @@ i_prot='undef'
 i_pthread='define'
 i_pwd='define'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='define'
 i_socks='undef'
@@ -751,7 +749,7 @@ libsdirs=' /usr/lib'
 libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so'
 libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so'
 libspath=' /usr/local/lib /lib /usr/lib'
-libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD'
+libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD'
 libswanted_uselargefiles=''
 line=''
 lint=''
@@ -1004,7 +1002,6 @@ useperlio='define'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='true'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index 033f46e0eb..151d8af1a6 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -429,7 +429,6 @@ d_setservent_r='undef'
 d_setsid='undef'
 d_setspent='undef'
 d_setvbuf='define'
-d_sfio='undef'
 d_shm='undef'
 d_shmat='undef'
 d_shmatprototype='undef'
@@ -658,7 +657,6 @@ i_prot='undef'
 i_pthread='undef'
 i_pwd='undef'
 i_rpcsvcdbm='define'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='undef'
 i_socks='undef'
@@ -1006,7 +1004,6 @@ useperlio='undef'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='true'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 65017336b1..64f9067263 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -784,12 +784,6 @@
  */
 #define I_NETINET_IN	/**/
 
-/* I_SFIO:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
- */
-/*#define	I_SFIO		/**/
-
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
  *	be included.
@@ -1959,12 +1953,6 @@
  */
 #define HAS_SETVBUF		/**/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
- */
-/*#define	USE_SFIO		/**/
-
 /* HAS_SHM:
  *	This symbol, if defined, indicates that the entire shm*(2) library is
  *	supported.
diff --git a/Porting/Glossary b/Porting/Glossary
index e7523ae566..c0d98ea8f7 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -2047,10 +2047,6 @@ d_setvbuf (d_setvbuf.U):
 	indicates to the C program that the setvbuf() routine is available
 	to change buffering on an open stdio stream.
 
-d_sfio (d_sfio.U):
-	This variable conditionally defines the USE_SFIO symbol,
-	and indicates whether sfio is available (and should be used).
-
 d_shm (d_shm.U):
 	This variable conditionally defines the HAS_SHM symbol, which
 	indicates that the entire shm*(2) library is present.
@@ -3162,10 +3158,6 @@ i_rpcsvcdbm (i_dbm.U):
 	indicates to the C program that <rpcsvc/dbm.h> exists and should
 	be included.  Some System V systems might need this instead of <dbm.h>.
 
-i_sfio (i_sfio.U):
-	This variable conditionally defines the I_SFIO symbol,
-	and indicates whether a C program should include <sfio.h>.
-
 i_sgtty (i_termio.U):
 	This variable conditionally defines the I_SGTTY symbol, which
 	indicates to the C program that it should include <sgtty.h> rather
@@ -5122,13 +5114,6 @@ userelocatableinc (bin.U):
 	containing the perl binary, and a logical cleanup of the path is then
 	made around the join point (removing "dir/../" pairs)
 
-usesfio (d_sfio.U):
-	This variable is set to true when the user agrees to use sfio.
-	It is set to false when sfio is not available or when the user
-	explicitly requests not to use sfio.  It is here primarily so
-	that command-line settings can override the auto-detection of
-	d_sfio without running into a "WHOA THERE".
-
 useshrplib (libperl.U):
 	This variable is set to 'true' if the user wishes
 	to build a shared libperl, and 'false' otherwise.
diff --git a/Porting/config.sh b/Porting/config.sh
index d8e3ae6550..e0ce05a549 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -449,7 +449,6 @@ d_setsent='define'
 d_setservent_r='undef'
 d_setsid='define'
 d_setvbuf='define'
-d_sfio='undef'
 d_shm='define'
 d_shmat='define'
 d_shmatprototype='define'
@@ -687,7 +686,6 @@ i_prot='undef'
 i_pthread='define'
 i_pwd='define'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='define'
 i_socks='undef'
@@ -793,7 +791,7 @@ libsdirs=' /usr/lib'
 libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so'
 libsfound=' /usr/lib/libnsl.so /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so /usr/lib/libgdbm_compat.so'
 libspath=' /pro/local/lib /lib /usr/lib /usr/local/lib'
-libswanted='sfio socket inet nsl nm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
+libswanted='socket inet nsl nm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
 libswanted_uselargefiles=''
 line=''
 lint=''
@@ -1060,7 +1058,6 @@ useperlio='define'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='false'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/Porting/config_H b/Porting/config_H
index e048329471..684383840f 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -707,12 +707,6 @@
  */
 #define I_NETINET_IN	/**/
 
-/* I_SFIO:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
- */
-/*#define	I_SFIO		/ **/
-
 /* I_STDBOOL:
  *	This symbol, if defined, indicates that <stdbool.h> exists and should
  *	be included.
@@ -3666,12 +3660,6 @@
  */
 /*#define HAS_SETPROCTITLE		/ **/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
- */
-/*#define	USE_SFIO		/ **/
-
 /* HAS_SIGNBIT:
  *	This symbol, if defined, indicates that the signbit routine is
  *	available to check if the given number has the sign bit set.
diff --git a/config_h.SH b/config_h.SH
index 4cb16845f5..c56867be6a 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -738,12 +738,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$i_niin I_NETINET_IN	/**/
 
-/* I_SFIO:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
- */
-#$i_sfio	I_SFIO		/**/
-
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
  *	be included.
@@ -3927,12 +3921,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$d_setproctitle HAS_SETPROCTITLE		/**/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
- */
-#$d_sfio	USE_SFIO		/**/
-
 /* HAS_SIGNBIT:
  *	This symbol, if defined, indicates that the signbit routine is
  *	available to check if the given number has the sign bit set.
diff --git a/configure.com b/configure.com
index c9afdc7fc8..6135dfaefa 100644
--- a/configure.com
+++ b/configure.com
@@ -4454,38 +4454,6 @@ $ tmp = "setvbuf"
 $ GOSUB inlibc
 $ d_setvbuf = tmp
 $!
-$! see if sfio.h is available
-$! see if sfio library is available
-$! Ok, but do we want to use it.
-$! IF F$TYPE(usesfio) .EQS. "" THEN usesfio = "undef"
-$! IF val .EQS. "define"
-$! THEN
-$!   IF usesfio .EQS. "define"
-$!   THEN dflt = "y"
-$!   ELSE dflt = "n"
-$!   ENDIF
-$!   echo "''package' can use the sfio library, but it is experimental."
-$!   rp="You seem to have sfio available, do you want to try using it? [''dflt'] "
-$!   GOSUB myread
-$!   IF ans .EQS. "" THEN ans = dflt
-$!   IF ans
-$!   THEN
-$!     echo "Ok, turning on sfio then."
-$!     val="define"
-$!   ELSE
-$!     echo "Ok, avoiding sfio this time.  I'll use stdio instead."
-$!     val="undef"
-$!   ENDIF
-$! ELSE
-$!   IF usesfio .EQS. "define"
-$!   THEN
-$!     echo4 "Sorry, cannot find sfio on this machine."
-$!     echo4 "Ignoring your setting of usesfio=''usesfio'."
-$!     val="undef"
-$!   ENDIF
-$! ENDIF
-$!
-$!
 $! Check for the shm* routines.
 $!
 $ OS
@@ -6272,7 +6240,6 @@ $ WC "d_setruid='undef'"
 $ WC "d_setsent='" + d_setsent + "'"
 $ WC "d_setsid='" + d_setsid + "'"
 $ WC "d_setvbuf='" + d_setvbuf + "'"
-$ WC "d_sfio='undef'"
 $ WC "d_shm='" + d_shm + "'"
 $ WC "d_shmat='" + d_shmat + "'"
 $ WC "d_shmatprototype='" + d_shmatprototype + "'"
@@ -6480,7 +6447,6 @@ $ WC "i_prot='undef'"
 $ WC "i_pthread='define'"
 $ WC "i_pwd='undef'"
 $ WC "i_rpcsvcdbm='undef'"
-$ WC "i_sfio='undef'"
 $ WC "i_sgtty='undef'"
 $ WC "i_shadow='" + i_shadow + "'"
 $ WC "i_socks='" + i_socks + "'"
diff --git a/cpan/Config-Perl-V/t/20_plv510.t b/cpan/Config-Perl-V/t/20_plv510.t
index 4b1e267a7a..5deb789a0a 100644
--- a/cpan/Config-Perl-V/t/20_plv510.t
+++ b/cpan/Config-Perl-V/t/20_plv510.t
@@ -32,7 +32,6 @@ Summary of my perl5 (revision 5 version 10 subversion 0) configuration:
     config_args='-Duse64bitint -des'
     hint=recommended, useposix=true, d_sigaction=define
     useithreads=undef, usemultiplicity=undef
-    useperlio=define, d_sfio=undef, uselargefiles=define, usesocks=undef
     use64bitint=define, use64bitall=undef, uselongdouble=undef
     usemymalloc=n, bincompat5005=undef
   Compiler:
diff --git a/cpan/Config-Perl-V/t/21_plv518.t b/cpan/Config-Perl-V/t/21_plv518.t
index ed0a2a6e34..298ef2dac9 100644
--- a/cpan/Config-Perl-V/t/21_plv518.t
+++ b/cpan/Config-Perl-V/t/21_plv518.t
@@ -61,7 +61,6 @@ Summary of my perl5 (revision 5 version 18 subversion 0) configuration:
     config_args='-Duse64bitint -Duselongdouble -des'
     hint=recommended, useposix=true, d_sigaction=define
     useithreads=undef, usemultiplicity=undef
-    useperlio=define, d_sfio=undef, uselargefiles=define, usesocks=undef
     use64bitint=define, use64bitall=undef, uselongdouble=define
     usemymalloc=n, bincompat5005=undef
   Compiler:
diff --git a/myconfig.SH b/myconfig.SH
index eafc4586ba..1808392dd3 100755
--- a/myconfig.SH
+++ b/myconfig.SH
@@ -37,7 +37,6 @@ Summary of my $package (revision $revision $version_patchlevel_string) configura
     config_args='$config_args'
     hint=$hint, useposix=$useposix, d_sigaction=$d_sigaction
     useithreads=$useithreads, usemultiplicity=$usemultiplicity
-    useperlio=$useperlio, d_sfio=$d_sfio, uselargefiles=$uselargefiles, usesocks=$usesocks
     use64bitint=$use64bitint, use64bitall=$use64bitall, uselongdouble=$uselongdouble
     usemymalloc=$usemymalloc, bincompat5005=undef
   Compiler:
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index 1508fab411..5820e9c07b 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -782,12 +782,6 @@
  */
 #define I_NETINET_IN	/* config-skip */
 
-/* I_SFIO:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
- */
-/*#define	I_SFIO		/ **/
-
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
  *	be included.
@@ -2318,12 +2312,6 @@
  */
 #define HAS_SETVBUF		/**/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
- */
-/*#define	USE_SFIO		/ **/
-
 /* HAS_SHM:
  *	This symbol, if defined, indicates that the entire shm*(2) library is
  *	supported.
diff --git a/plan9/config_h.sample b/plan9/config_h.sample
index b0876b82bc..2632187b2f 100644
--- a/plan9/config_h.sample
+++ b/plan9/config_h.sample
@@ -746,12 +746,6 @@
  */
 #define I_NETINET_IN	/**/
 
-/* I_SFIO:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
- */
-/*#define	I_SFIO		/ **/
-
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
  *	be included.
@@ -2271,12 +2265,6 @@
  */
 #define HAS_SETVBUF		/**/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
- */
-/*#define	USE_SFIO		/ **/
-
 /* HAS_SHM:
  *	This symbol, if defined, indicates that the entire shm*(2) library is
  *	supported.
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index cfc1bd283e..778992f4c9 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -439,7 +439,6 @@ d_setsent='undef'
 d_setservent_r='undef'
 d_setsid='define'
 d_setvbuf='define'
-d_sfio='undef'
 d_shm='undef'
 d_shmat='undef'
 d_shmatprototype='undef'
@@ -670,7 +669,6 @@ i_prot='undef'
 i_pthread='undef'
 i_pwd='define'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='undef'
 i_socks='undef'
@@ -762,7 +760,7 @@ libsdirs=''
 libsfiles=''
 libsfound=''
 libspath=' /lib'
-libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util'
+libswanted='socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util'
 libswanted_uselargefiles=''
 line=''
 lint=''
@@ -1014,7 +1012,6 @@ useperlio='define'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='false'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/symbian/config.sh b/symbian/config.sh
index 4e45ce1ffd..1f85eeea81 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -385,7 +385,6 @@ d_setsent='undef'
 d_setservent_r='undef'
 d_setsid='undef'
 d_setvbuf='define'
-d_sfio='undef'
 d_shm='undef'
 d_shmat='undef'
 d_shmatprototype='undef'
@@ -597,7 +596,6 @@ i_prot='undef'
 i_pthread='undef'
 i_pwd='define'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='undef'
 i_socks='undef'
@@ -829,7 +827,6 @@ useperlio='define'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='false'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/uconfig.h b/uconfig.h
index dcba397981..36dcf2ebbe 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -703,12 +703,6 @@
  */
 /*#define I_NETINET_IN	/ **/
 
-/* I_SFIO:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
- */
-/*#define	I_SFIO		/ **/
-
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
  *	be included.
@@ -3892,12 +3886,6 @@
  */
 /*#define HAS_SETPROCTITLE		/ **/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
- */
-/*#define	USE_SFIO		/ **/
-
 /* HAS_SIGNBIT:
  *	This symbol, if defined, indicates that the signbit routine is
  *	available to check if the given number has the sign bit set.
@@ -4730,6 +4718,6 @@
 #endif
 
 /* Generated from:
- * a5419b542988f62ae47b915c24316f8127992c16da312dc275d2f68fdd37a3ea config_h.SH
- * e9bb6377fb6bf7c21e01a97266c80d028aaecf5bf71f855ca6cca3b30d94882c uconfig.sh
+ * 63850d620b5f962e8fbbf7c826eb9cba1b8ac13f3443c80eee1c9061756fae69 config_h.SH
+ * 71b0dcf437b30c409fc23b5c4c6ec2c988fc419295a650fe80f93a6d5fb0ff94 uconfig.sh
  * ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index ca535de57f..5ae90b93af 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -378,7 +378,6 @@ d_setsent='undef'
 d_setservent_r='undef'
 d_setsid='undef'
 d_setvbuf='undef'
-d_sfio='undef'
 d_shm='undef'
 d_shmat='undef'
 d_shmatprototype='undef'
@@ -583,7 +582,6 @@ i_prot='undef'
 i_pthread='undef'
 i_pwd='undef'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='undef'
 i_socks='undef'
@@ -797,7 +795,6 @@ useperlio='undef'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='false'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/uconfig64.sh b/uconfig64.sh
index 1585ea8ca5..580e0c1d09 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -379,7 +379,6 @@ d_setsent='undef'
 d_setservent_r='undef'
 d_setsid='undef'
 d_setvbuf='undef'
-d_sfio='undef'
 d_shm='undef'
 d_shmat='undef'
 d_shmatprototype='undef'
@@ -584,7 +583,6 @@ i_prot='undef'
 i_pthread='undef'
 i_pwd='undef'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='undef'
 i_socks='undef'
@@ -797,7 +795,6 @@ useperlio='undef'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='false'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/win32/config.ce b/win32/config.ce
index c20e1bf36a..5e329b1b68 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -427,7 +427,6 @@ d_setservent_r='undef'
 d_setsid='undef'
 d_setspent='undef'
 d_setvbuf='undef'
-d_sfio='undef'
 d_shm='undef'
 d_shmat='undef'
 d_shmatprototype='undef'
@@ -654,7 +653,6 @@ i_prot='undef'
 i_pthread='undef'
 i_pwd='undef'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='undef'
 i_socks='undef'
@@ -996,7 +994,6 @@ useperlio='~USE_PERLIO~'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='true'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/win32/config.gc b/win32/config.gc
index e426c9b809..23ef3e3b26 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -427,7 +427,6 @@ d_setsent='undef'
 d_setservent_r='undef'
 d_setsid='undef'
 d_setvbuf='define'
-d_sfio='undef'
 d_shm='undef'
 d_shmat='undef'
 d_shmatprototype='undef'
@@ -666,7 +665,6 @@ i_prot='undef'
 i_pthread='undef'
 i_pwd='undef'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='undef'
 i_socks='undef'
@@ -1040,7 +1038,6 @@ useperlio='undef'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='true'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 8f2803f72e..a15b9267d3 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -427,7 +427,6 @@ d_setsent='undef'
 d_setservent_r='undef'
 d_setsid='undef'
 d_setvbuf='define'
-d_sfio='undef'
 d_shm='undef'
 d_shmat='undef'
 d_shmatprototype='undef'
@@ -665,7 +664,6 @@ i_prot='undef'
 i_pthread='undef'
 i_pwd='undef'
 i_rpcsvcdbm='undef'
-i_sfio='undef'
 i_sgtty='undef'
 i_shadow='undef'
 i_socks='undef'
@@ -1039,7 +1037,6 @@ useperlio='undef'
 useposix='true'
 usereentrant='undef'
 userelocatableinc='undef'
-usesfio='false'
 useshrplib='true'
 usesitecustomize='undef'
 usesocks='undef'
diff --git a/win32/config_H.ce b/win32/config_H.ce
index f6be13aec4..e7adb973d0 100644
--- a/win32/config_H.ce
+++ b/win32/config_H.ce
@@ -728,12 +728,6 @@
  */
 /*#define I_NETINET_IN	/**/
 
-/* I_SFIO:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
- */
-/*#define	I_SFIO		/**/
-
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
  *	be included.
@@ -2267,12 +2261,6 @@
  */
 /*#define HAS_SETVBUF		/**/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
- */
-/*#define	USE_SFIO		/**/
-
 /* HAS_SHM:
  *	This symbol, if defined, indicates that the entire shm*(2) library is
  *	supported.
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 2b15a18a42..0db52063ce 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -703,12 +703,6 @@
  */
 /*#define I_NETINET_IN	/ **/
 
-/* I_SFIO:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
- */
-/*#define	I_SFIO		/ **/
-
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
  *	be included.
@@ -3898,12 +3892,6 @@
  */
 /*#define HAS_SETPROCTITLE		/ **/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
- */
-/*#define	USE_SFIO		/ **/
-
 /* HAS_SIGNBIT:
  *	This symbol, if defined, indicates that the signbit routine is
  *	available to check if the given number has the sign bit set.
diff --git a/win32/config_H.vc b/win32/config_H.vc
index f980639ef2..f55a6d246d 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -703,12 +703,6 @@
  */
 /*#define I_NETINET_IN	/ **/
 
-/* I_SFIO:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
- */
-/*#define	I_SFIO		/ **/
-
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
  *	be included.
@@ -3892,12 +3886,6 @@
  */
 /*#define HAS_SETPROCTITLE		/ **/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
- */
-/*#define	USE_SFIO		/ **/
-
 /* HAS_SIGNBIT:
  *	This symbol, if defined, indicates that the signbit routine is
  *	available to check if the given number has the sign bit set.