replace "define\t" with "define " in most "normal" core files.

The main exceptions being dist/, ext/, and Configure related
files, which will be updated in a subsequent commit. Files in the cpan/
directory are also omitted as they are not owned by the core.

'#define' has seven characters, so following it with a \t makes it look
like '#define ' when it is not, which then frustrates attempts to find
where a given define is. If you *know* then you do a

    git grep -P 'define\s+WHATEVER'

but if don't or you forget, you can get very confused trying to find
where a given define is located. This fixes all such cases so they
actually are 'define WHATEVER' instead.

If this patch is getting in your way with blame analysis then view it
with the -w option to blame.

5 files changed, 327 insertions, 327 deletions

diff --git a/win32/config_H.gc b/win32/config_H.gc
index 8eb27c1bb1..af8c366b50 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -50,7 +50,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
@@ -228,7 +228,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
@@ -596,7 +596,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
@@ -630,7 +630,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
@@ -658,7 +658,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:
@@ -696,19 +696,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
@@ -862,7 +862,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
@@ -876,7 +876,7 @@
  *		2 = couldn't cast >= 0x80000000
  *		4 = couldn't cast in argument expression list
  */
-#define	CASTNEGFLOAT		/**/
+#define CASTNEGFLOAT            /**/
 #define CASTFLAGS 0		/**/
 
 /* VOID_CLOSEDIR:
@@ -978,13 +978,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()
@@ -1226,7 +1226,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
@@ -1568,7 +1568,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
@@ -1947,16 +1947,16 @@
  *	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_SOCKADDR_STORAGE	/**/
-#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_SOCKADDR_STORAGE    /**/
+#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
@@ -2158,7 +2158,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
@@ -2257,8 +2257,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:
@@ -2266,7 +2266,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
@@ -2352,7 +2352,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
@@ -2408,7 +2408,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
@@ -2428,7 +2428,7 @@
  *	makes sense if you *have* dlsym, which we will presume is the
  *	case if you're using dl_dlopen.xs.
  */
-/*#define	DLSYM_NEEDS_UNDERSCORE	/ **/
+/*#define DLSYM_NEEDS_UNDERSCORE        / **/
 
 /* HAS_DUP3:
  *	This symbol, if defined, indicates that the dup3 routine is
@@ -2531,7 +2531,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
@@ -2617,8 +2617,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
@@ -2647,7 +2647,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
@@ -2677,11 +2677,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
@@ -2889,8 +2889,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
@@ -3126,13 +3126,13 @@
  *	This symbol, if defined, indicates that the C program should
  *	include <xlocale.h> to get newlocale() and its friends.
  */
-/*#define	HAS_NEWLOCALE	/ **/
-/*#define	HAS_FREELOCALE	/ **/
-/*#define	HAS_USELOCALE	/ **/
-/*#define	HAS_DUPLOCALE	/ **/
-/*#define	HAS_QUERYLOCALE	/ **/
-/*#define	NEED_XLOCALE_H	/ **/
-/*#define	I_XLOCALE               / **/
+/*#define HAS_NEWLOCALE / **/
+/*#define HAS_FREELOCALE        / **/
+/*#define HAS_USELOCALE / **/
+/*#define HAS_DUPLOCALE / **/
+/*#define HAS_QUERYLOCALE       / **/
+/*#define NEED_XLOCALE_H        / **/
+/*#define I_XLOCALE               / **/
 
 /* HAS_NEXTAFTER:
  *	This symbol, if defined, indicates that the nextafter routine is
@@ -3158,7 +3158,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 routine is
@@ -3203,7 +3203,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
@@ -3250,7 +3250,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
@@ -3316,7 +3316,7 @@
  *	be used.
  */
 #ifndef USE_SITECUSTOMIZE
-/*#define	USE_SITECUSTOMIZE		/ **/
+/*#define USE_SITECUSTOMIZE             / **/
 #endif
 
 /* HAS_SNPRINTF:
@@ -3342,7 +3342,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
@@ -3362,7 +3362,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
@@ -3370,7 +3370,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
@@ -3469,7 +3469,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
@@ -3477,7 +3477,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
@@ -3509,12 +3509,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
@@ -3579,7 +3579,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
@@ -3630,20 +3630,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
@@ -3685,19 +3685,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
@@ -3709,13 +3709,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
@@ -3727,7 +3727,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
@@ -3739,37 +3739,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
@@ -3781,54 +3781,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>
@@ -3839,7 +3839,7 @@
 /* I_WCTYPE:
  *	This symbol, if defined, indicates that <wctype.h> exists.
  */
-/*#define	I_WCTYPE		/ **/
+/*#define I_WCTYPE              / **/
 
 /* DOUBLEINFBYTES:
  *	This symbol, if defined, is a comma-separated list of
@@ -3990,7 +3990,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.
@@ -4081,36 +4081,36 @@
  *	This symbol, if defined, indicates that a variable of type NVTYPE
  *	stores 0.0 in memory as all bits zero.
  */
-#define	IVTYPE		long long		/**/
-#define	UVTYPE		unsigned long long		/**/
-#define	I8TYPE		char		/**/
-#define	U8TYPE		unsigned char		/**/
-#define	I16TYPE		short	/**/
-#define	U16TYPE		unsigned short	/**/
-#define	I32TYPE		long	/**/
-#define	U32TYPE		unsigned long	/**/
+#define IVTYPE          long long               /**/
+#define UVTYPE          unsigned long long              /**/
+#define I8TYPE          char            /**/
+#define U8TYPE          unsigned char           /**/
+#define I16TYPE         short   /**/
+#define U16TYPE         unsigned short  /**/
+#define I32TYPE         long    /**/
+#define U32TYPE         unsigned long   /**/
 #ifdef HAS_QUAD
-#define	I64TYPE		long long	/**/
-#define	U64TYPE		unsigned long long	/**/
+#define I64TYPE         long long       /**/
+#define U64TYPE         unsigned long 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
@@ -4177,19 +4177,19 @@
  *	This symbol defines the format string used for printing a Perl U32
  *	as an unsigned hexadecimal integer in uppercase ABCDEF.
  */
-#define	IVdf		"I64d"		/**/
-#define	UVuf		"I64u"		/**/
-#define	UVof		"I64o"		/**/
-#define	UVxf		"I64x"		/**/
-#define	UVXf		"I64X"		/**/
-#define	NVef		"e"		/**/
-#define	NVff		"f"		/**/
-#define	NVgf		"g"		/**/
-#define	I32df		"ld"		/**/
-#define	U32uf		"lu"		/**/
-#define	U32of		"lo"		/**/
-#define	U32xf		"lx"		/**/
-#define	U32Xf		"lX"		/**/
+#define IVdf            "I64d"          /**/
+#define UVuf            "I64u"          /**/
+#define UVof            "I64o"          /**/
+#define UVxf            "I64x"          /**/
+#define UVXf            "I64X"          /**/
+#define NVef            "e"             /**/
+#define NVff            "f"             /**/
+#define NVgf            "g"             /**/
+#define I32df           "ld"            /**/
+#define U32uf           "lu"            /**/
+#define U32of           "lo"            /**/
+#define U32xf           "lx"            /**/
+#define U32Xf           "lX"            /**/
 
 /* SELECT_MIN_BITS:
  *	This symbol holds the minimum number of bits operated by select.
@@ -4234,7 +4234,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
@@ -4279,10 +4279,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:
@@ -4309,7 +4309,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:
@@ -4324,7 +4324,7 @@
  *	should be used when available.
  */
 #ifndef USE_LARGE_FILES
-#define	USE_LARGE_FILES		/**/
+#define USE_LARGE_FILES         /**/
 #endif
 
 /* USE_LONG_DOUBLE:
@@ -4332,7 +4332,7 @@
  *	be used when available.
  */
 #ifndef USE_LONG_DOUBLE
-/*#define	USE_LONG_DOUBLE		/ **/
+/*#define USE_LONG_DOUBLE               / **/
 #endif
 
 /* USE_MORE_BITS:
@@ -4340,7 +4340,7 @@
  *	long doubles should be used when available.
  */
 #ifndef USE_MORE_BITS
-/*#define	USE_MORE_BITS		/ **/
+/*#define USE_MORE_BITS         / **/
 #endif
 
 /* MULTIPLICITY:
@@ -4348,7 +4348,7 @@
  *	be built to use multiplicity.
  */
 #ifndef MULTIPLICITY
-/*#define	MULTIPLICITY		/ **/
+/*#define MULTIPLICITY          / **/
 #endif
 
 /* USE_NSGETEXECUTABLEPATH:
@@ -4364,7 +4364,7 @@
  *	used in a fully backward compatible manner.
  */
 #ifndef USE_PERLIO
-#define	USE_PERLIO		/**/
+#define USE_PERLIO              /**/
 #endif
 
 /* USE_QUADMATH:
@@ -4372,7 +4372,7 @@
  *	be used when available.
  */
 #ifndef USE_QUADMATH
-/*#define	USE_QUADMATH		/ **/
+/*#define USE_QUADMATH          / **/
 #endif
 
 /* USE_SOCKS:
@@ -4380,7 +4380,7 @@
  *	be built to use socks.
  */
 #ifndef USE_SOCKS
-/*#define	USE_SOCKS		/ **/
+/*#define USE_SOCKS             / **/
 #endif
 
 /* HAS_DRAND48_PROTO:
@@ -4389,7 +4389,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
@@ -4397,7 +4397,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
@@ -4405,7 +4405,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
@@ -4413,7 +4413,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
@@ -4421,7 +4421,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
@@ -4429,7 +4429,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
@@ -5240,10 +5240,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.
@@ -5273,7 +5273,7 @@
 /* Gid_t_f:
  *	This symbol defines the format string used for printing a Gid_t.
  */
-#define	Gid_t_f		"ld"		/**/
+#define Gid_t_f         "ld"            /**/
 
 /* Gid_t_sign:
  *	This symbol holds the signedness of a Gid_t.
@@ -5341,7 +5341,7 @@
 /* Uid_t_f:
  *	This symbol defines the format string used for printing a Uid_t.
  */
-#define	Uid_t_f		"ld"		/**/
+#define Uid_t_f         "ld"            /**/
 
 /* Uid_t_sign:
  *	This symbol holds the signedness of a Uid_t.
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 515b5a068e..bdb446db4e 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -50,7 +50,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
@@ -228,7 +228,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
@@ -596,7 +596,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
@@ -630,7 +630,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
@@ -658,7 +658,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:
@@ -696,19 +696,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
@@ -862,7 +862,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
@@ -876,7 +876,7 @@
  *		2 = couldn't cast >= 0x80000000
  *		4 = couldn't cast in argument expression list
  */
-#define	CASTNEGFLOAT		/**/
+#define CASTNEGFLOAT            /**/
 #define CASTFLAGS 0		/**/
 
 /* VOID_CLOSEDIR:
@@ -978,13 +978,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()
@@ -1226,7 +1226,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
@@ -1568,7 +1568,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
@@ -1947,16 +1947,16 @@
  *	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_SOCKADDR_STORAGE	/**/
-#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_SOCKADDR_STORAGE    /**/
+#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
@@ -2158,7 +2158,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
@@ -2257,8 +2257,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:
@@ -2266,7 +2266,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
@@ -2352,7 +2352,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
@@ -2408,7 +2408,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
@@ -2428,7 +2428,7 @@
  *	makes sense if you *have* dlsym, which we will presume is the
  *	case if you're using dl_dlopen.xs.
  */
-/*#define	DLSYM_NEEDS_UNDERSCORE	/ **/
+/*#define DLSYM_NEEDS_UNDERSCORE        / **/
 
 /* HAS_DUP3:
  *	This symbol, if defined, indicates that the dup3 routine is
@@ -2531,7 +2531,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
@@ -2617,8 +2617,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
@@ -2647,7 +2647,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
@@ -2677,11 +2677,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
@@ -2889,8 +2889,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
@@ -3126,13 +3126,13 @@
  *	This symbol, if defined, indicates that the C program should
  *	include <xlocale.h> to get newlocale() and its friends.
  */
-/*#define	HAS_NEWLOCALE	/ **/
-/*#define	HAS_FREELOCALE	/ **/
-/*#define	HAS_USELOCALE	/ **/
-/*#define	HAS_DUPLOCALE	/ **/
-/*#define	HAS_QUERYLOCALE	/ **/
-/*#define	NEED_XLOCALE_H	/ **/
-/*#define	I_XLOCALE               / **/
+/*#define HAS_NEWLOCALE / **/
+/*#define HAS_FREELOCALE        / **/
+/*#define HAS_USELOCALE / **/
+/*#define HAS_DUPLOCALE / **/
+/*#define HAS_QUERYLOCALE       / **/
+/*#define NEED_XLOCALE_H        / **/
+/*#define I_XLOCALE               / **/
 
 /* HAS_NEXTAFTER:
  *	This symbol, if defined, indicates that the nextafter routine is
@@ -3158,7 +3158,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 routine is
@@ -3203,7 +3203,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
@@ -3250,7 +3250,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
@@ -3316,7 +3316,7 @@
  *	be used.
  */
 #ifndef USE_SITECUSTOMIZE
-/*#define	USE_SITECUSTOMIZE		/ **/
+/*#define USE_SITECUSTOMIZE             / **/
 #endif
 
 /* HAS_SNPRINTF:
@@ -3342,7 +3342,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
@@ -3362,7 +3362,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
@@ -3370,7 +3370,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
@@ -3469,7 +3469,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
@@ -3477,7 +3477,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
@@ -3509,12 +3509,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
@@ -3579,7 +3579,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
@@ -3630,20 +3630,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
@@ -3685,19 +3685,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
@@ -3709,13 +3709,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
@@ -3727,7 +3727,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
@@ -3739,37 +3739,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
@@ -3781,54 +3781,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>
@@ -3839,7 +3839,7 @@
 /* I_WCTYPE:
  *	This symbol, if defined, indicates that <wctype.h> exists.
  */
-/*#define	I_WCTYPE		/ **/
+/*#define I_WCTYPE              / **/
 
 /* DOUBLEINFBYTES:
  *	This symbol, if defined, is a comma-separated list of
@@ -3990,7 +3990,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.
@@ -4081,36 +4081,36 @@
  *	This symbol, if defined, indicates that a variable of type NVTYPE
  *	stores 0.0 in memory as all bits zero.
  */
-#define	IVTYPE		__int64		/**/
-#define	UVTYPE		unsigned __int64		/**/
-#define	I8TYPE		char		/**/
-#define	U8TYPE		unsigned char		/**/
-#define	I16TYPE		short	/**/
-#define	U16TYPE		unsigned short	/**/
-#define	I32TYPE		long	/**/
-#define	U32TYPE		unsigned long	/**/
+#define IVTYPE          __int64         /**/
+#define UVTYPE          unsigned __int64                /**/
+#define I8TYPE          char            /**/
+#define U8TYPE          unsigned char           /**/
+#define I16TYPE         short   /**/
+#define U16TYPE         unsigned short  /**/
+#define I32TYPE         long    /**/
+#define U32TYPE         unsigned long   /**/
 #ifdef HAS_QUAD
-#define	I64TYPE		__int64	/**/
-#define	U64TYPE		unsigned __int64	/**/
+#define I64TYPE         __int64 /**/
+#define U64TYPE         unsigned __int64        /**/
 #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
@@ -4177,19 +4177,19 @@
  *	This symbol defines the format string used for printing a Perl U32
  *	as an unsigned hexadecimal integer in uppercase ABCDEF.
  */
-#define	IVdf		"I64d"		/**/
-#define	UVuf		"I64u"		/**/
-#define	UVof		"I64o"		/**/
-#define	UVxf		"I64x"		/**/
-#define	UVXf		"I64X"		/**/
-#define	NVef		"e"		/**/
-#define	NVff		"f"		/**/
-#define	NVgf		"g"		/**/
-#define	I32df		"ld"		/**/
-#define	U32uf		"lu"		/**/
-#define	U32of		"lo"		/**/
-#define	U32xf		"lx"		/**/
-#define	U32Xf		"lX"		/**/
+#define IVdf            "I64d"          /**/
+#define UVuf            "I64u"          /**/
+#define UVof            "I64o"          /**/
+#define UVxf            "I64x"          /**/
+#define UVXf            "I64X"          /**/
+#define NVef            "e"             /**/
+#define NVff            "f"             /**/
+#define NVgf            "g"             /**/
+#define I32df           "ld"            /**/
+#define U32uf           "lu"            /**/
+#define U32of           "lo"            /**/
+#define U32xf           "lx"            /**/
+#define U32Xf           "lX"            /**/
 
 /* SELECT_MIN_BITS:
  *	This symbol holds the minimum number of bits operated by select.
@@ -4234,7 +4234,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
@@ -4279,10 +4279,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:
@@ -4309,7 +4309,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:
@@ -4324,7 +4324,7 @@
  *	should be used when available.
  */
 #ifndef USE_LARGE_FILES
-#define	USE_LARGE_FILES		/**/
+#define USE_LARGE_FILES         /**/
 #endif
 
 /* USE_LONG_DOUBLE:
@@ -4332,7 +4332,7 @@
  *	be used when available.
  */
 #ifndef USE_LONG_DOUBLE
-/*#define	USE_LONG_DOUBLE		/ **/
+/*#define USE_LONG_DOUBLE               / **/
 #endif
 
 /* USE_MORE_BITS:
@@ -4340,7 +4340,7 @@
  *	long doubles should be used when available.
  */
 #ifndef USE_MORE_BITS
-/*#define	USE_MORE_BITS		/ **/
+/*#define USE_MORE_BITS         / **/
 #endif
 
 /* MULTIPLICITY:
@@ -4348,7 +4348,7 @@
  *	be built to use multiplicity.
  */
 #ifndef MULTIPLICITY
-/*#define	MULTIPLICITY		/ **/
+/*#define MULTIPLICITY          / **/
 #endif
 
 /* USE_NSGETEXECUTABLEPATH:
@@ -4364,7 +4364,7 @@
  *	used in a fully backward compatible manner.
  */
 #ifndef USE_PERLIO
-#define	USE_PERLIO		/**/
+#define USE_PERLIO              /**/
 #endif
 
 /* USE_QUADMATH:
@@ -4372,7 +4372,7 @@
  *	be used when available.
  */
 #ifndef USE_QUADMATH
-/*#define	USE_QUADMATH		/ **/
+/*#define USE_QUADMATH          / **/
 #endif
 
 /* USE_SOCKS:
@@ -4380,7 +4380,7 @@
  *	be built to use socks.
  */
 #ifndef USE_SOCKS
-/*#define	USE_SOCKS		/ **/
+/*#define USE_SOCKS             / **/
 #endif
 
 /* HAS_DRAND48_PROTO:
@@ -4389,7 +4389,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
@@ -4397,7 +4397,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
@@ -4405,7 +4405,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
@@ -4413,7 +4413,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
@@ -4421,7 +4421,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
@@ -4429,7 +4429,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
@@ -5240,10 +5240,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.
@@ -5273,7 +5273,7 @@
 /* Gid_t_f:
  *	This symbol defines the format string used for printing a Gid_t.
  */
-#define	Gid_t_f		"ld"		/**/
+#define Gid_t_f         "ld"            /**/
 
 /* Gid_t_sign:
  *	This symbol holds the signedness of a Gid_t.
@@ -5341,7 +5341,7 @@
 /* Uid_t_f:
  *	This symbol defines the format string used for printing a Uid_t.
  */
-#define	Uid_t_f		"ld"		/**/
+#define Uid_t_f         "ld"            /**/
 
 /* Uid_t_sign:
  *	This symbol holds the signedness of a Uid_t.
diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h
index 8f93fa0429..185e7ddab2 100644
--- a/win32/include/sys/socket.h
+++ b/win32/include/sys/socket.h
@@ -35,7 +35,7 @@ extern "C" {
 #endif
 
 #define PERL_BITS_PER_BYTE	8
-#define	PERL_NFDBITS		(sizeof(Perl_fd_mask)*PERL_BITS_PER_BYTE)
+#define PERL_NFDBITS            (sizeof(Perl_fd_mask)*PERL_BITS_PER_BYTE)
 
 typedef int			Perl_fd_mask;
 
diff --git a/win32/win32.h b/win32/win32.h
index 77e4f06279..211c55ce7e 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -204,10 +204,10 @@ struct utsname {
 
 /* access() mode bits */
 #ifndef R_OK
-#  define	R_OK	4
-#  define	W_OK	2
-#  define	X_OK	1
-#  define	F_OK	0
+#  define R_OK  4
+#  define W_OK  2
+#  define X_OK  1
+#  define F_OK  0
 #endif
 
 /* for waitpid() */
diff --git a/win32/win32iop.h b/win32/win32iop.h
index 9733d7b532..a50d840a2d 100644
--- a/win32/win32iop.h
+++ b/win32/win32iop.h
@@ -200,7 +200,7 @@ END_EXTERN_C
 
 #define stderr				win32_stderr()
 #define stdout				win32_stdout()
-#define	stdin				win32_stdin()
+#define stdin                           win32_stdin()
 #define feof(f)				win32_feof(f)
 #define ferror(f)			win32_ferror(f)
 #define errno 				(*win32_errno())
@@ -210,17 +210,17 @@ END_EXTERN_C
  * redirect to our own version
  */
 #undef fprintf
-#define	fprintf			win32_fprintf
-#define	vfprintf		win32_vfprintf
-#define	printf			win32_printf
-#define	vprintf			win32_vprintf
+#define fprintf                 win32_fprintf
+#define vfprintf                win32_vfprintf
+#define printf                  win32_printf
+#define vprintf                 win32_vprintf
 #define fread(buf,size,count,f)	win32_fread(buf,size,count,f)
 #define fwrite(buf,size,count,f)	win32_fwrite(buf,size,count,f)
 #define fopen			win32_fopen
 #undef fdopen
 #define fdopen			win32_fdopen
 #define freopen			win32_freopen
-#define	fclose(f)		win32_fclose(f)
+#define fclose(f)               win32_fclose(f)
 #define fputs(s,f)		win32_fputs(s,f)
 #define fputc(c,f)		win32_fputc(c,f)
 #define ungetc(c,f)		win32_ungetc(c,f)