Replace "define\t" with "define " in Configure/metaconfig related files

This is broken out so it is easier for Tux to find and merge with
metaconfig.

View this patch with -w and you will see "no changes" except for
config_h.SH and Porting/config_h.pl both which needed to be changed to
ensure that they produce output that doesn't replicate the problem.

5 files changed, 192 insertions, 190 deletions

diff --git a/Configure b/Configure
index 0ad1dbe151..8cfad2d8f0 100755
--- a/Configure
+++ b/Configure
@@ -10732,7 +10732,7 @@ while test $# -ge 2; do
     shift 2
 done
 cat >> try.c <<'EOCP'
-#define	_(args) args
+#define _(args) args
 EOCP
 echo "$foo" >> try.c
 echo 'int no_real_function_has_this_name _((void)) { return 0; }' >> try.c
diff --git a/Porting/config_H b/Porting/config_H
index ec289322ee..27e607239f 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -54,7 +54,7 @@
  *	This symbol, if defined, indicates that the chsize routine is available
  *	to truncate files.  You might need a -lx to get this routine.
  */
-/*#define	HAS_CHSIZE		/ **/
+/*#define HAS_CHSIZE            / **/
 
 /* HAS_CRYPT:
  *	This symbol, if defined, indicates that the crypt routine is available
@@ -232,7 +232,7 @@
  *	This symbol, if defined, indicates that the mbstowcs routine is
  *	available to convert a multibyte string into a wide character string.
  */
-#define	HAS_MBSTOWCS		/**/
+#define HAS_MBSTOWCS            /**/
 
 /* HAS_MBTOWC:
  *	This symbol, if defined, indicates that the mbtowc routine is available
@@ -606,7 +606,7 @@
  *	This symbol, if defined, indicates to the C program that it should
  *	include <arpa/inet.h> to get inet_addr and friends declarations.
  */
-#define	I_ARPA_INET		/**/
+#define I_ARPA_INET             /**/
 
 /* I_DBM:
  *	This symbol, if defined, indicates that <dbm.h> exists and should
@@ -640,7 +640,7 @@
  *	This symbol, if defined, indicates to the C program that it should
  *	include <locale.h>.
  */
-#define	I_LOCALE		/**/
+#define I_LOCALE                /**/
 
 /* I_NETINET_IN:
  *	This symbol, if defined, indicates to the C program that it should
@@ -668,7 +668,7 @@
  *	This symbol, if defined, indicates the <sys/sockio.h> should be included
  *	to get socket ioctl options, like SIOCATMARK.
  */
-#define	I_SYS_IOCTL		/**/
+#define I_SYS_IOCTL             /**/
 /*#define I_SYS_SOCKIO	/ **/
 
 /* I_SYS_NDIR:
@@ -706,19 +706,19 @@
  *	This symbol, if defined, indicates to the C program that it should
  *	include <sys/stat.h>.
  */
-#define	I_SYS_STAT		/**/
+#define I_SYS_STAT              /**/
 
 /* I_SYS_TIMES:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <sys/times.h>.
  */
-#define	I_SYS_TIMES		/**/
+#define I_SYS_TIMES             /**/
 
 /* I_SYS_TYPES:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <sys/types.h>.
  */
-#define	I_SYS_TYPES		/**/
+#define I_SYS_TYPES             /**/
 
 /* I_SYS_UN:
  *	This symbol, if defined, indicates to the C program that it should
@@ -872,7 +872,7 @@
  *	This symbol is defined if the C compiler can cast negative
  *	or large floating point numbers to 32-bit ints.
  */
-/*#define	CASTI32		/ **/
+/*#define CASTI32               / **/
 
 /* CASTNEGFLOAT:
  *	This symbol is defined if the C compiler can cast negative
@@ -886,7 +886,7 @@
  *		2 = couldn't cast >= 0x80000000
  *		4 = couldn't cast in argument expression list
  */
-#define	CASTNEGFLOAT		/**/
+#define CASTNEGFLOAT            /**/
 #define CASTFLAGS 0		/**/
 
 /* VOID_CLOSEDIR:
@@ -988,13 +988,13 @@
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_value member
  */
-#define	HAS_SIGINFO_SI_ERRNO	/**/
-#define	HAS_SIGINFO_SI_PID	/**/
-#define	HAS_SIGINFO_SI_UID	/**/
-#define	HAS_SIGINFO_SI_ADDR	/**/
-#define	HAS_SIGINFO_SI_STATUS	/**/
-#define	HAS_SIGINFO_SI_BAND	/**/
-#define	HAS_SIGINFO_SI_VALUE	/**/
+#define HAS_SIGINFO_SI_ERRNO    /**/
+#define HAS_SIGINFO_SI_PID      /**/
+#define HAS_SIGINFO_SI_UID      /**/
+#define HAS_SIGINFO_SI_ADDR     /**/
+#define HAS_SIGINFO_SI_STATUS   /**/
+#define HAS_SIGINFO_SI_BAND     /**/
+#define HAS_SIGINFO_SI_VALUE    /**/
 
 /* HAS_SIGSETJMP:
  *	This variable indicates to the C program that the sigsetjmp()
@@ -1224,7 +1224,7 @@
  *	This symbol, if defined, indicates that this system uses
  *	EBCDIC encoding.
  */
-/*#define	EBCDIC 		/ **/
+/*#define EBCDIC                / **/
 
 /* ARCHLIB:
  *	This variable, if defined, holds the name of the directory in
@@ -1561,7 +1561,7 @@
  *	This symbol, if defined, indicates that the system supports filenames
  *	longer than 14 characters.
  */
-#define	FLEXFILENAMES		/**/
+#define FLEXFILENAMES           /**/
 
 /* HAS_GETGRENT:
  *	This symbol, if defined, indicates that the getgrent routine is
@@ -1934,15 +1934,15 @@
  *	This symbol, if defined, indicates the availability of
  *	struct ipv6_mreq_source;
  */
-#define	HAS_SOCKET		/**/
-#define	HAS_SOCKETPAIR	/**/
-/*#define	HAS_SOCKADDR_SA_LEN	/ **/
-#define	HAS_SOCKADDR_IN6	/**/
-#define	HAS_SIN6_SCOPE_ID	/**/
-#define	HAS_IP_MREQ	/**/
-#define	HAS_IP_MREQ_SOURCE	/**/
-#define	HAS_IPV6_MREQ	/**/
-/*#define	HAS_IPV6_MREQ_SOURCE	/ **/
+#define HAS_SOCKET              /**/
+#define HAS_SOCKETPAIR  /**/
+/*#define HAS_SOCKADDR_SA_LEN   / **/
+#define HAS_SOCKADDR_IN6        /**/
+#define HAS_SIN6_SCOPE_ID       /**/
+#define HAS_IP_MREQ     /**/
+#define HAS_IP_MREQ_SOURCE      /**/
+#define HAS_IPV6_MREQ   /**/
+/*#define HAS_IPV6_MREQ_SOURCE  / **/
 
 /* USE_STAT_BLOCKS:
  *	This symbol is defined if this system has a stat structure declaring
@@ -2144,7 +2144,7 @@
  *	This symbol, if defined, indicates that <sys/uio.h> exists and
  *	should be included.
  */
-#define	I_SYSUIO		/**/
+#define I_SYSUIO                /**/
 
 /* I_TERMIO:
  *	This symbol, if defined, indicates that the program should include
@@ -2243,8 +2243,8 @@
  *	Perl has been cross-compiled to.  Undefined if not a cross-compile.
  */
 #ifndef USE_CROSS_COMPILE
-/*#define	USE_CROSS_COMPILE	/ **/
-#define	PERL_TARGETARCH	""	/**/
+/*#define USE_CROSS_COMPILE     / **/
+#define PERL_TARGETARCH ""      /**/
 #endif
 
 /* PERL_USE_DEVEL:
@@ -2252,7 +2252,7 @@
  *	-Dusedevel, to enable development features.  This should not be
  *	done for production builds.
  */
-#define	PERL_USE_DEVEL		/**/
+#define PERL_USE_DEVEL          /**/
 
 /* HAS_ATOLF:
  *	This symbol, if defined, indicates that the atolf routine is
@@ -2331,7 +2331,7 @@
 /* HAS_C99_VARIADIC_MACROS:
  *	If defined, the compiler supports C99 variadic macros.
  */
-#define	HAS_C99_VARIADIC_MACROS	/**/
+#define HAS_C99_VARIADIC_MACROS /**/
 
 /* HAS_CLASS:
  *	This symbol, if defined, indicates that the class routine is
@@ -2387,7 +2387,7 @@
  *	to the program to supply one.  A good guess is
  *		extern int dbminit(char *);
  */
-#define	HAS_DBMINIT_PROTO	/**/
+#define HAS_DBMINIT_PROTO       /**/
 
 /* HAS_DIR_DD_FD:
  *	This symbol, if defined, indicates that the the DIR* dirstream
@@ -2497,7 +2497,7 @@
  *	to the program to supply one.  A good guess is
  *		extern int flock(int, int);
  */
-#define	HAS_FLOCK_PROTO	/**/
+#define HAS_FLOCK_PROTO /**/
 
 /* HAS_FMA:
  *	This symbol, if defined, indicates that the fma routine is
@@ -2583,8 +2583,8 @@
  *           FP_NAN        NaN
  *
  */
-#define	HAS_FPCLASSIFY		/**/
-/*#define	HAS_FP_CLASSIFY		/ **/
+#define HAS_FPCLASSIFY          /**/
+/*#define HAS_FP_CLASSIFY               / **/
 
 /* HAS_FPCLASSL:
  *	This symbol, if defined, indicates that the fpclassl routine is
@@ -2613,7 +2613,7 @@
 /* HAS_FPOS64_T:
  *	This symbol will be defined if the C compiler supports fpos64_t.
  */
-/*#define	HAS_FPOS64_T    	/ **/
+/*#define HAS_FPOS64_T          / **/
 
 /* HAS_FREXPL:
  *	This symbol, if defined, indicates that the frexpl routine is
@@ -2643,11 +2643,11 @@
 /* HAS_UNLINKAT:
  *	This symbol is defined if the unlinkat() routine is available.
  */
-#define	HAS_FCHMODAT	/**/
-#define	HAS_LINKAT	/**/
-#define	HAS_OPENAT	/**/
-#define	HAS_RENAMEAT	/**/
-#define	HAS_UNLINKAT	/**/
+#define HAS_FCHMODAT    /**/
+#define HAS_LINKAT      /**/
+#define HAS_OPENAT      /**/
+#define HAS_RENAMEAT    /**/
+#define HAS_UNLINKAT    /**/
 
 /* HAS_FSEEKO:
  *	This symbol, if defined, indicates that the fseeko routine is
@@ -2855,8 +2855,8 @@
  *	j0l() function is available for Bessel functions of the first
  *	kind of the order zero, for long doubles.
  */
-#define	HAS_J0		/**/
-#define	HAS_J0L		/**/
+#define HAS_J0          /**/
+#define HAS_J0L         /**/
 
 /* HAS_LC_MONETARY_2008:
  *	This symbol, if defined, indicates that the localeconv routine is
@@ -3081,11 +3081,11 @@
  *	This symbol, if defined, indicates to the C program that it should
  *	include <xlocale.h> to get uselocale() and its friends.
  */
-#define	HAS_NEWLOCALE	/**/
-#define	HAS_FREELOCALE	/**/
-#define	HAS_USELOCALE	/**/
-/*#define	HAS_QUERYLOCALE	/ **/
-#define	I_XLOCALE               /**/
+#define HAS_NEWLOCALE   /**/
+#define HAS_FREELOCALE  /**/
+#define HAS_USELOCALE   /**/
+/*#define HAS_QUERYLOCALE       / **/
+#define I_XLOCALE               /**/
 
 /* HAS_NEXTAFTER:
  *	This symbol, if defined, indicates that the nextafter routine is
@@ -3111,7 +3111,7 @@
 /* HAS_OFF64_T:
  *	This symbol will be defined if the C compiler supports off64_t.
  */
-/*#define	HAS_OFF64_T    		/ **/
+/*#define HAS_OFF64_T                   / **/
 
 /* HAS_PIPE2:
  *	This symbol, if defined, indicates that the pipe2
@@ -3156,7 +3156,7 @@
 /* HAS_PTRDIFF_T:
  *	This symbol will be defined if the C compiler supports ptrdiff_t.
  */
-#define	HAS_PTRDIFF_T    		/**/
+#define HAS_PTRDIFF_T                   /**/
 
 /* HAS_READV:
  *	This symbol, if defined, indicates that the readv routine is
@@ -3203,7 +3203,7 @@
  *		extern void* sbrk(int);
  *		extern void* sbrk(size_t);
  */
-#define	HAS_SBRK_PROTO	/**/
+#define HAS_SBRK_PROTO  /**/
 
 /* HAS_SCALBN:
  *	This symbol, if defined, indicates that the scalbn routine is
@@ -3258,7 +3258,7 @@
  *	be used.
  */
 #ifndef USE_SITECUSTOMIZE
-/*#define	USE_SITECUSTOMIZE		/ **/
+/*#define USE_SITECUSTOMIZE             / **/
 #endif
 
 /* HAS_SNPRINTF:
@@ -3284,7 +3284,7 @@
  *	to the program to supply one.  A good guess is
  *		extern int sockatmark(int);
  */
-#define	HAS_SOCKATMARK_PROTO	/**/
+#define HAS_SOCKATMARK_PROTO    /**/
 
 /* HAS_SOCKS5_INIT:
  *	This symbol, if defined, indicates that the socks5_init routine is
@@ -3304,7 +3304,7 @@
  *	to the program to supply one.  Good guesses are
  *		extern int setresgid(uid_t ruid, uid_t euid, uid_t suid);
  */
-/*#define	HAS_SETRESGID_PROTO	/ **/
+/*#define HAS_SETRESGID_PROTO   / **/
 
 /* HAS_SETRESUID_PROTO:
  *	This symbol, if defined, indicates that the system provides
@@ -3312,7 +3312,7 @@
  *	to the program to supply one.  Good guesses are
  *		extern int setresuid(uid_t ruid, uid_t euid, uid_t suid);
  */
-/*#define	HAS_SETRESUID_PROTO	/ **/
+/*#define HAS_SETRESUID_PROTO   / **/
 
 /* HAS_STRUCT_STATFS_F_FLAGS:
  *	This symbol, if defined, indicates that the struct statfs
@@ -3405,7 +3405,7 @@
  *		extern int syscall(int,  ...);
  *		extern int syscall(long, ...);
  */
-#define	HAS_SYSCALL_PROTO	/**/
+#define HAS_SYSCALL_PROTO       /**/
 
 /* HAS_TELLDIR_PROTO:
  *	This symbol, if defined, indicates that the system provides
@@ -3413,7 +3413,7 @@
  *	to the program to supply one.  A good guess is
  *		extern long telldir(DIR*);
  */
-#define	HAS_TELLDIR_PROTO	/**/
+#define HAS_TELLDIR_PROTO       /**/
 
 /* HAS_TGAMMA:
  *	This symbol, if defined, indicates that the tgamma routine is
@@ -3445,12 +3445,12 @@
  *	This symbol, if defined, indicates that the asctime64 () routine is
  *	available to do the 64bit variant of asctime ()
  */
-/*#define	HAS_CTIME64		/ **/
-/*#define	HAS_LOCALTIME64		/ **/
-/*#define	HAS_GMTIME64		/ **/
-/*#define	HAS_MKTIME64		/ **/
-/*#define	HAS_DIFFTIME64		/ **/
-/*#define	HAS_ASCTIME64		/ **/
+/*#define HAS_CTIME64           / **/
+/*#define HAS_LOCALTIME64               / **/
+/*#define HAS_GMTIME64          / **/
+/*#define HAS_MKTIME64          / **/
+/*#define HAS_DIFFTIME64                / **/
+/*#define HAS_ASCTIME64         / **/
 
 /* HAS_TIMEGM:
  *	This symbol, if defined, indicates that the timegm routine is
@@ -3503,7 +3503,7 @@
  *	to the program to supply one.  A good guess is
  *		extern int usleep(useconds_t);
  */
-#define	HAS_USLEEP_PROTO	/**/
+#define HAS_USLEEP_PROTO        /**/
 
 /* HAS_USTAT:
  *	This symbol, if defined, indicates that the ustat system call is
@@ -3554,20 +3554,20 @@
  *	Note that if fflushNULL is defined, fflushall will not
  *	even be probed for and will be left undefined.
  */
-#define	FFLUSH_NULL 		/**/
-/*#define	FFLUSH_ALL 		/ **/
+#define FFLUSH_NULL             /**/
+/*#define FFLUSH_ALL            / **/
 
 /* I_BFD:
  *	This symbol, if defined, indicates that <bfd.h> exists and
  *	can be included.
  */
-/*#define	I_BFD		/ **/
+/*#define I_BFD         / **/
 
 /* I_CRYPT:
  *	This symbol, if defined, indicates that <crypt.h> exists and
  *	should be included.
  */
-#define	I_CRYPT		/**/
+#define I_CRYPT         /**/
 
 /* DB_Prefix_t:
  *	This symbol contains the type of the prefix structure element
@@ -3609,19 +3609,19 @@
  *	This symbol, if defined, indicates that <fp.h> exists and
  *	should be included.
  */
-/*#define	I_FP		/ **/
+/*#define I_FP          / **/
 
 /* I_FP_CLASS:
  *	This symbol, if defined, indicates that <fp_class.h> exists and
  *	should be included.
  */
-/*#define	I_FP_CLASS		/ **/
+/*#define I_FP_CLASS            / **/
 
 /* I_IEEEFP:
  *	This symbol, if defined, indicates that <ieeefp.h> exists and
  *	should be included.
  */
-/*#define	I_IEEEFP		/ **/
+/*#define I_IEEEFP              / **/
 
 /* I_INTTYPES:
  *     This symbol, if defined, indicates to the C program that it should
@@ -3633,13 +3633,13 @@
  *	This symbol, if defined, indicates that <langinfo.h> exists and
  *	should be included.
  */
-#define	I_LANGINFO		/**/
+#define I_LANGINFO              /**/
 
 /* I_LIBUTIL:
  *	This symbol, if defined, indicates that <libutil.h> exists and
  *	should be included.
  */
-/*#define	I_LIBUTIL		/ **/
+/*#define I_LIBUTIL             / **/
 
 /* I_MALLOCMALLOC:
  *	This symbol, if defined, indicates to the C program that it should
@@ -3651,7 +3651,7 @@
  *	This symbol, if defined, indicates that <mntent.h> exists and
  *	should be included.
  */
-#define	I_MNTENT		/**/
+#define I_MNTENT                /**/
 
 /* I_NETINET_TCP:
  *     This symbol, if defined, indicates to the C program that it should
@@ -3663,37 +3663,37 @@
  *	This symbol, if defined, indicates that <poll.h> exists and
  *	should be included. (see also HAS_POLL)
  */
-#define	I_POLL		/**/
+#define I_POLL          /**/
 
 /* I_PROT:
  *	This symbol, if defined, indicates that <prot.h> exists and
  *	should be included.
  */
-/*#define	I_PROT		/ **/
+/*#define I_PROT                / **/
 
 /* I_QUADMATH:
  *	This symbol, if defined, indicates that <quadmath.h> exists and
  *	should be included.
  */
-#define	I_QUADMATH		/**/
+#define I_QUADMATH              /**/
 
 /* I_SHADOW:
  *	This symbol, if defined, indicates that <shadow.h> exists and
  *	should be included.
  */
-#define	I_SHADOW		/**/
+#define I_SHADOW                /**/
 
 /* I_SOCKS:
  *	This symbol, if defined, indicates that <socks.h> exists and
  *	should be included.
  */
-/*#define	I_SOCKS		/ **/
+/*#define I_SOCKS               / **/
 
 /* I_STDBOOL:
  *	This symbol, if defined, indicates that <stdbool.h> exists and
  *	can be included.
  */
-#define	I_STDBOOL		/**/
+#define I_STDBOOL               /**/
 
 /* I_STDINT:
  *	This symbol, if defined, indicates that <stdint.h> exists and
@@ -3705,54 +3705,54 @@
  *	This symbol, if defined, indicates that <sunmath.h> exists and
  *	should be included.
  */
-/*#define	I_SUNMATH		/ **/
+/*#define I_SUNMATH             / **/
 
 /* I_SYSLOG:
  *	This symbol, if defined, indicates that <syslog.h> exists and
  *	should be included.
  */
-#define	I_SYSLOG		/**/
+#define I_SYSLOG                /**/
 
 /* I_SYSMODE:
  *	This symbol, if defined, indicates that <sys/mode.h> exists and
  *	should be included.
  */
-/*#define	I_SYSMODE		/ **/
+/*#define I_SYSMODE             / **/
 
 /* I_SYS_MOUNT:
  *	This symbol, if defined, indicates that <sys/mount.h> exists and
  *	should be included.
  */
-#define	I_SYS_MOUNT		/**/
+#define I_SYS_MOUNT             /**/
 
 /* I_SYS_STATFS:
  *	This symbol, if defined, indicates that <sys/statfs.h> exists.
  */
-#define	I_SYS_STATFS		/**/
+#define I_SYS_STATFS            /**/
 
 /* I_SYS_STATVFS:
  *	This symbol, if defined, indicates that <sys/statvfs.h> exists and
  *	should be included.
  */
-#define	I_SYS_STATVFS		/**/
+#define I_SYS_STATVFS           /**/
 
 /* I_SYSUTSNAME:
  *	This symbol, if defined, indicates that <sys/utsname.h> exists and
  *	should be included.
  */
-#define	I_SYSUTSNAME		/**/
+#define I_SYSUTSNAME            /**/
 
 /* I_SYS_VFS:
  *	This symbol, if defined, indicates that <sys/vfs.h> exists and
  *	should be included.
  */
-#define	I_SYS_VFS		/**/
+#define I_SYS_VFS               /**/
 
 /* I_USTAT:
  *	This symbol, if defined, indicates that <ustat.h> exists and
  *	should be included.
  */
-#define	I_USTAT		/**/
+#define I_USTAT         /**/
 
 /* I_WCHAR:
  *     This symbol, if defined, indicates to the C program that <wchar.h>
@@ -3909,7 +3909,7 @@
  *	of copying mechanisms, handy.h defines a platform-
  *	independent macro, Perl_va_copy(src, dst), to do the job.
  */
-#define	NEED_VA_COPY		/**/
+#define NEED_VA_COPY            /**/
 
 /* IVTYPE:
  *	This symbol defines the C type used for Perl's IV.
@@ -4000,36 +4000,36 @@
  *	This symbol, if defined, indicates that a variable of type NVTYPE
  *	stores 0.0 in memory as all bits zero.
  */
-#define	IVTYPE		long		/**/
-#define	UVTYPE		unsigned long		/**/
-#define	I8TYPE		signed char		/**/
-#define	U8TYPE		unsigned char		/**/
-#define	I16TYPE		short	/**/
-#define	U16TYPE		unsigned short	/**/
-#define	I32TYPE		int	/**/
-#define	U32TYPE		unsigned int	/**/
+#define IVTYPE          long            /**/
+#define UVTYPE          unsigned long           /**/
+#define I8TYPE          signed char             /**/
+#define U8TYPE          unsigned char           /**/
+#define I16TYPE         short   /**/
+#define U16TYPE         unsigned short  /**/
+#define I32TYPE         int     /**/
+#define U32TYPE         unsigned int    /**/
 #ifdef HAS_QUAD
-#define	I64TYPE		long	/**/
-#define	U64TYPE		unsigned long	/**/
+#define I64TYPE         long    /**/
+#define U64TYPE         unsigned long   /**/
 #endif
-#define	NVTYPE		double		/**/
-#define	IVSIZE		8		/**/
-#define	UVSIZE		8		/**/
-#define	I8SIZE		1		/**/
-#define	U8SIZE		1		/**/
-#define	I16SIZE		2	/**/
-#define	U16SIZE		2	/**/
-#define	I32SIZE		4	/**/
-#define	U32SIZE		4	/**/
+#define NVTYPE          double          /**/
+#define IVSIZE          8               /**/
+#define UVSIZE          8               /**/
+#define I8SIZE          1               /**/
+#define U8SIZE          1               /**/
+#define I16SIZE         2       /**/
+#define U16SIZE         2       /**/
+#define I32SIZE         4       /**/
+#define U32SIZE         4       /**/
 #ifdef HAS_QUAD
-#define	I64SIZE		8	/**/
-#define	U64SIZE		8	/**/
+#define I64SIZE         8       /**/
+#define U64SIZE         8       /**/
 #endif
-#define	NVSIZE		8		/**/
+#define NVSIZE          8               /**/
 #undef	NV_PRESERVES_UV
-#define	NV_PRESERVES_UV_BITS	53
-#define	NV_OVERFLOWS_INTEGERS_AT	(256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0)
-#define	NV_ZERO_IS_ALLBITS_ZERO
+#define NV_PRESERVES_UV_BITS    53
+#define NV_OVERFLOWS_INTEGERS_AT        (256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0)
+#define NV_ZERO_IS_ALLBITS_ZERO
 #if UVSIZE == 8
 #   ifdef BYTEORDER
 #       if BYTEORDER == 0x1234
@@ -4076,14 +4076,14 @@
  *	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	UVXf		"lX"		/**/
-#define	NVef		"e"		/**/
-#define	NVff		"f"		/**/
-#define	NVgf		"g"		/**/
+#define IVdf            "ld"            /**/
+#define UVuf            "lu"            /**/
+#define UVof            "lo"            /**/
+#define UVxf            "lx"            /**/
+#define UVXf            "lX"            /**/
+#define NVef            "e"             /**/
+#define NVff            "f"             /**/
+#define NVgf            "g"             /**/
 
 /* SELECT_MIN_BITS:
  *	This symbol holds the minimum number of bits operated by select.
@@ -4119,7 +4119,7 @@
  *	This symbol tells the name of the array holding the stdio streams.
  *	Usual values include _iob, __iob, and __sF.
  */
-/*#define	HAS_STDIO_STREAM_ARRAY	/ **/
+/*#define HAS_STDIO_STREAM_ARRAY        / **/
 #ifdef HAS_STDIO_STREAM_ARRAY
 #define STDIO_STREAM_ARRAY	
 #endif
@@ -4164,10 +4164,10 @@
  *	you may need at least to reboot your OS to 64-bit mode.
  */
 #ifndef USE_64_BIT_INT
-#define	USE_64_BIT_INT		/**/
+#define USE_64_BIT_INT          /**/
 #endif
 #ifndef USE_64_BIT_ALL
-#define	USE_64_BIT_ALL		/**/
+#define USE_64_BIT_ALL          /**/
 #endif
 
 /* USE_C_BACKTRACE:
@@ -4188,7 +4188,7 @@
  *	Defaults to define in Perls 5.8 and earlier, to undef later.
  */
 #ifndef USE_FAST_STDIO
-/*#define	USE_FAST_STDIO		/ **/
+/*#define USE_FAST_STDIO                / **/
 #endif
 
 /* USE_KERN_PROC_PATHNAME:
@@ -4203,7 +4203,7 @@
  *	should be used when available.
  */
 #ifndef USE_LARGE_FILES
-#define	USE_LARGE_FILES		/**/
+#define USE_LARGE_FILES         /**/
 #endif
 
 /* USE_LONG_DOUBLE:
@@ -4211,7 +4211,7 @@
  *	be used when available.
  */
 #ifndef USE_LONG_DOUBLE
-/*#define	USE_LONG_DOUBLE		/ **/
+/*#define USE_LONG_DOUBLE               / **/
 #endif
 
 /* USE_MORE_BITS:
@@ -4219,7 +4219,7 @@
  *	long doubles should be used when available.
  */
 #ifndef USE_MORE_BITS
-/*#define	USE_MORE_BITS		/ **/
+/*#define USE_MORE_BITS         / **/
 #endif
 
 /* MULTIPLICITY:
@@ -4227,7 +4227,7 @@
  *	be built to use multiplicity.
  */
 #ifndef MULTIPLICITY
-/*#define	MULTIPLICITY		/ **/
+/*#define MULTIPLICITY          / **/
 #endif
 
 /* USE_NSGETEXECUTABLEPATH:
@@ -4243,7 +4243,7 @@
  *	used in a fully backward compatible manner.
  */
 #ifndef USE_PERLIO
-#define	USE_PERLIO		/**/
+#define USE_PERLIO              /**/
 #endif
 
 /* USE_QUADMATH:
@@ -4251,7 +4251,7 @@
  *	be used when available.
  */
 #ifndef USE_QUADMATH
-/*#define	USE_QUADMATH		/ **/
+/*#define USE_QUADMATH          / **/
 #endif
 
 /* USE_SOCKS:
@@ -4259,7 +4259,7 @@
  *	be built to use socks.
  */
 #ifndef USE_SOCKS
-/*#define	USE_SOCKS		/ **/
+/*#define USE_SOCKS             / **/
 #endif
 
 /* HAS_DRAND48_PROTO:
@@ -4268,7 +4268,7 @@
  *	to the program to supply one.  A good guess is
  *		extern double drand48(void);
  */
-#define	HAS_DRAND48_PROTO	/**/
+#define HAS_DRAND48_PROTO       /**/
 
 /* HAS_GETHOST_PROTOS:
  *	This symbol, if defined, indicates that <netdb.h> includes
@@ -4276,7 +4276,7 @@
  *	gethostbyaddr().  Otherwise, it is up to the program to guess
  *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
  */
-#define	HAS_GETHOST_PROTOS	/**/
+#define HAS_GETHOST_PROTOS      /**/
 
 /* HAS_GETNET_PROTOS:
  *	This symbol, if defined, indicates that <netdb.h> includes
@@ -4284,7 +4284,7 @@
  *	getnetbyaddr().  Otherwise, it is up to the program to guess
  *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
  */
-#define	HAS_GETNET_PROTOS	/**/
+#define HAS_GETNET_PROTOS       /**/
 
 /* HAS_GETPROTO_PROTOS:
  *	This symbol, if defined, indicates that <netdb.h> includes
@@ -4292,7 +4292,7 @@
  *	getprotobyaddr().  Otherwise, it is up to the program to guess
  *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
  */
-#define	HAS_GETPROTO_PROTOS	/**/
+#define HAS_GETPROTO_PROTOS     /**/
 
 /* HAS_GETSERV_PROTOS:
  *	This symbol, if defined, indicates that <netdb.h> includes
@@ -4300,7 +4300,7 @@
  *	getservbyaddr().  Otherwise, it is up to the program to guess
  *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
  */
-#define	HAS_GETSERV_PROTOS	/**/
+#define HAS_GETSERV_PROTOS      /**/
 
 /* HAS_LSEEK_PROTO:
  *	This symbol, if defined, indicates that the system provides
@@ -4308,7 +4308,7 @@
  *	to the program to supply one.  A good guess is
  *		extern off_t lseek(int, off_t, int);
  */
-#define	HAS_LSEEK_PROTO	/**/
+#define HAS_LSEEK_PROTO /**/
 
 /* Netdb_host_t:
  *	This symbol holds the type used for the 1st argument
@@ -5080,10 +5080,10 @@
  *	try to use the various _r versions of library functions.
  *	This is extremely experimental.
  */
-/*#define	USE_ITHREADS		/ **/
-/*#define		USE_THREADS		/ **/
-/*#define	OLD_PTHREADS_API		/ **/
-/*#define	USE_REENTRANT_API	/ **/
+/*#define USE_ITHREADS          / **/
+/*#define       USE_THREADS             / **/
+/*#define OLD_PTHREADS_API              / **/
+/*#define USE_REENTRANT_API     / **/
 
 /* HAS_TIME:
  *	This symbol, if defined, indicates that the time() routine exists.
@@ -5113,7 +5113,7 @@
 /* Gid_t_f:
  *	This symbol defines the format string used for printing a Gid_t.
  */
-#define	Gid_t_f		"u"		/**/
+#define Gid_t_f         "u"             /**/
 
 /* Gid_t_sign:
  *	This symbol holds the signedness of a Gid_t.
@@ -5181,7 +5181,7 @@
 /* Uid_t_f:
  *	This symbol defines the format string used for printing a Uid_t.
  */
-#define	Uid_t_f		"u"		/**/
+#define Uid_t_f         "u"             /**/
 
 /* Uid_t_sign:
  *	This symbol holds the signedness of a Uid_t.
diff --git a/Porting/config_h.pl b/Porting/config_h.pl
index 935834990d..7c828cf70c 100755
--- a/Porting/config_h.pl
+++ b/Porting/config_h.pl
@@ -78,6 +78,8 @@ unless ($ch[0] =~ m/THIS IS A GENERATED FILE/) {
     push @ch, ";;\nesac\n";
     }
 
+s/^(\s*)#(\s*)define\t\s*/${1}#${2}define /gm for @ch;
+
 open  $ch, ">", $cSH or die "Cannot write $cSH: $!\n";
 print $ch @ch;
 close $ch;
diff --git a/config_h.SH b/config_h.SH
index 18c90d3a8d..5605ffc7a7 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -2286,7 +2286,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #ifndef USE_CROSS_COMPILE
 #$usecrosscompile	USE_CROSS_COMPILE	/**/
-#define	PERL_TARGETARCH	"$targetarch"	/**/
+#define PERL_TARGETARCH	"$targetarch"	/**/
 #endif
 
 /* PERL_USE_DEVEL:
@@ -4051,11 +4051,11 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *	This symbol defines the format string used for printing a Perl U32
  *	as an unsigned hexadecimal integer in uppercase ABCDEF.
  */
-#define	I32df		$i32dformat		/**/
-#define	U32of		$u32oformat		/**/
-#define	U32uf		$u32uformat		/**/
-#define	U32xf		$u32xformat		/**/
-#define	U32Xf		$u32XUformat		/**/
+#define I32df		$i32dformat		/**/
+#define U32of		$u32oformat		/**/
+#define U32uf		$u32uformat		/**/
+#define U32xf		$u32xformat		/**/
+#define U32Xf		$u32XUformat		/**/
 
 /* IVTYPE:
  *	This symbol defines the C type used for Perl's IV.
@@ -4146,35 +4146,35 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *	This symbol, if defined, indicates that a variable of type NVTYPE
  *	stores 0.0 in memory as all bits zero.
  */
-#define	IVTYPE		$ivtype		/**/
-#define	UVTYPE		$uvtype		/**/
-#define	I8TYPE		$i8type		/**/
-#define	U8TYPE		$u8type		/**/
-#define	I16TYPE		$i16type	/**/
-#define	U16TYPE		$u16type	/**/
-#define	I32TYPE		$i32type	/**/
-#define	U32TYPE		$u32type	/**/
+#define IVTYPE		$ivtype		/**/
+#define UVTYPE		$uvtype		/**/
+#define I8TYPE		$i8type		/**/
+#define U8TYPE		$u8type		/**/
+#define I16TYPE		$i16type	/**/
+#define U16TYPE		$u16type	/**/
+#define I32TYPE		$i32type	/**/
+#define U32TYPE		$u32type	/**/
 #ifdef HAS_QUAD
-#define	I64TYPE		$i64type	/**/
-#define	U64TYPE		$u64type	/**/
+#define I64TYPE		$i64type	/**/
+#define U64TYPE		$u64type	/**/
 #endif
-#define	NVTYPE		$nvtype		/**/
-#define	IVSIZE		$ivsize		/**/
-#define	UVSIZE		$uvsize		/**/
-#define	I8SIZE		$i8size		/**/
-#define	U8SIZE		$u8size		/**/
-#define	I16SIZE		$i16size	/**/
-#define	U16SIZE		$u16size	/**/
-#define	I32SIZE		$i32size	/**/
-#define	U32SIZE		$u32size	/**/
+#define NVTYPE		$nvtype		/**/
+#define IVSIZE		$ivsize		/**/
+#define UVSIZE		$uvsize		/**/
+#define I8SIZE		$i8size		/**/
+#define U8SIZE		$u8size		/**/
+#define I16SIZE		$i16size	/**/
+#define U16SIZE		$u16size	/**/
+#define I32SIZE		$i32size	/**/
+#define U32SIZE		$u32size	/**/
 #ifdef HAS_QUAD
-#define	I64SIZE		$i64size	/**/
-#define	U64SIZE		$u64size	/**/
+#define I64SIZE		$i64size	/**/
+#define U64SIZE		$u64size	/**/
 #endif
-#define	NVSIZE		$nvsize		/**/
+#define NVSIZE		$nvsize		/**/
 #$d_nv_preserves_uv	NV_PRESERVES_UV
-#define	NV_PRESERVES_UV_BITS	$nv_preserves_uv_bits
-#define	NV_OVERFLOWS_INTEGERS_AT	($nv_overflows_integers_at)
+#define NV_PRESERVES_UV_BITS	$nv_preserves_uv_bits
+#define NV_OVERFLOWS_INTEGERS_AT	($nv_overflows_integers_at)
 #$d_nv_zero_is_allbits_zero	NV_ZERO_IS_ALLBITS_ZERO
 #if UVSIZE == 8
 #   ifdef BYTEORDER
@@ -4222,14 +4222,14 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *	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	UVXf		$uvXUformat		/**/
-#define	NVef		$nveformat		/**/
-#define	NVff		$nvfformat		/**/
-#define	NVgf		$nvgformat		/**/
+#define IVdf		$ivdformat		/**/
+#define UVuf		$uvuformat		/**/
+#define UVof		$uvoformat		/**/
+#define UVxf		$uvxformat		/**/
+#define UVXf		$uvXUformat		/**/
+#define NVef		$nveformat		/**/
+#define NVff		$nvfformat		/**/
+#define NVgf		$nvgformat		/**/
 
 /* SELECT_MIN_BITS:
  *	This symbol holds the minimum number of bits operated by select.
@@ -5326,7 +5326,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 /* Gid_t_f:
  *	This symbol defines the format string used for printing a Gid_t.
  */
-#define	Gid_t_f		$gidformat		/**/
+#define Gid_t_f		$gidformat		/**/
 
 /* Gid_t_sign:
  *	This symbol holds the signedness of a Gid_t.
@@ -5394,7 +5394,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 /* Uid_t_f:
  *	This symbol defines the format string used for printing a Uid_t.
  */
-#define	Uid_t_f		$uidformat		/**/
+#define Uid_t_f		$uidformat		/**/
 
 /* Uid_t_sign:
  *	This symbol holds the signedness of a Uid_t.
diff --git a/uconfig.h b/uconfig.h
index abcef8b503..7013262319 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -5382,6 +5382,6 @@
 #endif
 
 /* Generated from:
- * b1c4cc0e63b951bc7c48ade0ad04d6bc7f679723f6da5c89479870204b20bdb5 config_h.SH
+ * 174bcf68d4780b29467af80be166e1fc8ce42f57426a7bd489282f4c7e351597 config_h.SH
  * 3577cf63ab13f859a1a2bfb5e211ddc0befbf0b1d4c6f2f8819f7ed79a91f695 uconfig.sh
  * ex: set ro ft=c: */