reentr.h: #undef some helper #defines

These exist just to decide if certain other macros are to be #defined or
not.  Once that is done, they are of no further use. #undef them so they
don't pollute the name space.

Author: khwilliamson

reentr.h

@@ -664,8 +664,6 @@ BEGIN
     eI
     EIGHT_BIT_UTF8_TO_NATIVE
     EMBEDMYMALLOC
-    ENDGRENT_R_HAS_FPTR
-    ENDPWENT_R_HAS_FPTR
     ENV_INIT
     ENV_LOCK
     ENV_READ_LOCK
@@ -765,76 +763,31 @@ BEGIN
     GETENV_LOCK
     GETENV_UNLOCK
     get_extended_os_errno
-    GETGRENT_R_HAS_BUFFER
-    GETGRENT_R_HAS_FPTR
-    GETGRENT_R_HAS_PTR
-    GETGRGID_R_HAS_BUFFER
-    GETGRGID_R_HAS_PTR
-    GETGRNAM_R_HAS_BUFFER
-    GETGRNAM_R_HAS_PTR
     GETHOSTBYADDR_LOCK
-    GETHOSTBYADDR_R_HAS_BUFFER
-    GETHOSTBYADDR_R_HAS_ERRNO
-    GETHOSTBYADDR_R_HAS_PTR
     GETHOSTBYADDR_UNLOCK
     GETHOSTBYNAME_LOCK
-    GETHOSTBYNAME_R_HAS_BUFFER
-    GETHOSTBYNAME_R_HAS_ERRNO
-    GETHOSTBYNAME_R_HAS_PTR
     GETHOSTBYNAME_UNLOCK
-    GETHOSTENT_R_HAS_BUFFER
-    GETHOSTENT_R_HAS_ERRNO
-    GETHOSTENT_R_HAS_PTR
     GETNETBYADDR_LOCK
-    GETNETBYADDR_R_HAS_BUFFER
-    GETNETBYADDR_R_HAS_ERRNO
-    GETNETBYADDR_R_HAS_PTR
     GETNETBYADDR_UNLOCK
     GETNETBYNAME_LOCK
-    GETNETBYNAME_R_HAS_BUFFER
-    GETNETBYNAME_R_HAS_ERRNO
-    GETNETBYNAME_R_HAS_PTR
     GETNETBYNAME_UNLOCK
-    GETNETENT_R_HAS_BUFFER
-    GETNETENT_R_HAS_ERRNO
-    GETNETENT_R_HAS_PTR
     GETPROTOBYNAME_LOCK
-    GETPROTOBYNAME_R_HAS_BUFFER
-    GETPROTOBYNAME_R_HAS_PTR
     GETPROTOBYNAME_UNLOCK
     GETPROTOBYNUMBER_LOCK
-    GETPROTOBYNUMBER_R_HAS_BUFFER
-    GETPROTOBYNUMBER_R_HAS_PTR
     GETPROTOBYNUMBER_UNLOCK
     GETPROTOENT_LOCK
-    GETPROTOENT_R_HAS_BUFFER
-    GETPROTOENT_R_HAS_PTR
     GETPROTOENT_UNLOCK
-    GETPWENT_R_HAS_BUFFER
-    GETPWENT_R_HAS_FPTR
-    GETPWENT_R_HAS_PTR
     GETPWNAM_LOCK
-    GETPWNAM_R_HAS_BUFFER
-    GETPWNAM_R_HAS_PTR
     GETPWNAM_UNLOCK
     GETPWUID_LOCK
-    GETPWUID_R_HAS_PTR
     GETPWUID_UNLOCK
     GETSERVBYNAME_LOCK
-    GETSERVBYNAME_R_HAS_BUFFER
-    GETSERVBYNAME_R_HAS_PTR
     GETSERVBYNAME_UNLOCK
     GETSERVBYPORT_LOCK
-    GETSERVBYPORT_R_HAS_BUFFER
-    GETSERVBYPORT_R_HAS_PTR
     GETSERVBYPORT_UNLOCK
     GETSERVENT_LOCK
-    GETSERVENT_R_HAS_BUFFER
-    GETSERVENT_R_HAS_PTR
     GETSERVENT_UNLOCK
     GETSPNAM_LOCK
-    GETSPNAM_R_HAS_BUFFER
-    GETSPNAM_R_HAS_PTR
     GETSPNAM_UNLOCK
     GETTARGET
     GETTARGETSTACKED
@@ -2730,15 +2683,13 @@ BEGIN
     Semctl
     semun
     SETERRNO
-    SETGRENT_R_HAS_FPTR
     SETi
     SET_MARK_OFFSET
     SETn
     SET_NUMERIC_STANDARD
     SET_NUMERIC_UNDERLYING
     SETp
     SetProgLen
-    SETPWENT_R_HAS_FPTR
     SET_recode_x_to_native
     SETs
     SET_SVANY_FOR_BODYLESS_IV

regen/embed.pl

@@ -431,6 +431,10 @@ sub define {
 #  endif
 
 EOF
+    # The elements of this array existed only to decide the contents of the
+    # "USE_foo" macro just above.  #undef them so as to not pollute the name
+    # space
+    push @define, map { "#  undef $_\n" } @H;
 }
 
 define('BUFFER',  'B',