metaconfig: regen _r units.

p4raw-id: //depot/metaconfig@15212

diff --git a/U/threads/d_asctime_r.U b/U/threads/d_asctime_r.U
index 182c3a3..7c47fa6 100644 (file)
--- a/U/threads/d_asctime_r.U
+++ b/U/threads/d_asctime_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_asctime_r asctime_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_asctime_r asctime_r_proto: Inlibc Protochk i_systypes i_time
 ?MAKE:  -pick add $@ %<
 ?S:d_asctime_r:
 ?S:     This variable conditionally defines the HAS_ASCTIME_R symbol,
@@ -26,7 +26,7 @@ set asctime_r d_asctime_r
 eval $inlibc
 case "$d_asctime_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_time time.h"
+       hdrs="$i_systypes sys/types.h $i_time time.h"
        case "$asctime_r_proto" in
        '')     try='extern char* asctime_r(const struct tm*, char*);'
                ./protochk "$try" $hdrs && asctime_r_proto=B_SB;

diff --git a/U/threads/d_crypt_r.U b/U/threads/d_crypt_r.U
index 3e73321..05fd369 100644 (file)
--- a/U/threads/d_crypt_r.U
+++ b/U/threads/d_crypt_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_crypt_r crypt_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_crypt_r crypt_r_proto: Inlibc Protochk i_systypes i_unistd
 ?MAKE:  -pick add $@ %<
 ?S:d_crypt_r:
 ?S:     This variable conditionally defines the HAS_CRYPT_R symbol,
@@ -26,7 +26,7 @@ set crypt_r d_crypt_r
 eval $inlibc
 case "$d_crypt_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
        case "$crypt_r_proto" in
        '')     try='extern char* crypt_r(const char*, const char*, struct crypt_data*);'
                ./protochk "$try" $hdrs && crypt_r_proto=B_CCS;

diff --git a/U/threads/d_ctermid_r.U b/U/threads/d_ctermid_r.U
index d20fef9..ac9f601 100644 (file)
--- a/U/threads/d_ctermid_r.U
+++ b/U/threads/d_ctermid_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_ctermid_r ctermid_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_ctermid_r ctermid_r_proto: Inlibc Protochk i_systypes i_stdio
 ?MAKE:  -pick add $@ %<
 ?S:d_ctermid_r:
 ?S:     This variable conditionally defines the HAS_CTERMID_R symbol,
@@ -26,7 +26,7 @@ set ctermid_r d_ctermid_r
 eval $inlibc
 case "$d_ctermid_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_stdio stdio.h"
+       hdrs="$i_systypes sys/types.h $i_stdio stdio.h"
        case "$ctermid_r_proto" in
        '')     try='extern char* ctermid_r(char*);'
                ./protochk "$try" $hdrs && ctermid_r_proto=B_B;

diff --git a/U/threads/d_ctime_r.U b/U/threads/d_ctime_r.U
index 6d2185e..21c6e0e 100644 (file)
--- a/U/threads/d_ctime_r.U
+++ b/U/threads/d_ctime_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_ctime_r ctime_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_ctime_r ctime_r_proto: Inlibc Protochk i_systypes i_time
 ?MAKE:  -pick add $@ %<
 ?S:d_ctime_r:
 ?S:     This variable conditionally defines the HAS_CTIME_R symbol,
@@ -26,7 +26,7 @@ set ctime_r d_ctime_r
 eval $inlibc
 case "$d_ctime_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_time time.h"
+       hdrs="$i_systypes sys/types.h $i_time time.h"
        case "$ctime_r_proto" in
        '')     try='extern char* ctime_r(const time_t*, char*);'
                ./protochk "$try" $hdrs && ctime_r_proto=B_SB;

diff --git a/U/threads/d_drand48_r.U b/U/threads/d_drand48_r.U
index 60acb88..20269e9 100644 (file)
--- a/U/threads/d_drand48_r.U
+++ b/U/threads/d_drand48_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_drand48_r drand48_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_drand48_r drand48_r_proto: Inlibc Protochk i_systypes i_stdlib
 ?MAKE:  -pick add $@ %<
 ?S:d_drand48_r:
 ?S:     This variable conditionally defines the HAS_DRAND48_R symbol,
@@ -26,7 +26,7 @@ set drand48_r d_drand48_r
 eval $inlibc
 case "$d_drand48_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_stdlib stdlib.h"
+       hdrs="$i_systypes sys/types.h $i_stdlib stdlib.h"
        case "$drand48_r_proto" in
        '')     try='extern int drand48_r(long, double*);'
                ./protochk "$try" $hdrs && drand48_r_proto=I_LT;

diff --git a/U/threads/d_endgrent_r.U b/U/threads/d_endgrent_r.U
index de30edd..8a18d80 100644 (file)
--- a/U/threads/d_endgrent_r.U
+++ b/U/threads/d_endgrent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_endgrent_r endgrent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_endgrent_r endgrent_r_proto: Inlibc Protochk i_systypes i_grp
 ?MAKE:  -pick add $@ %<
 ?S:d_endgrent_r:
 ?S:     This variable conditionally defines the HAS_ENDGRENT_R symbol,
@@ -26,7 +26,7 @@ set endgrent_r d_endgrent_r
 eval $inlibc
 case "$d_endgrent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_grp grp.h"
+       hdrs="$i_systypes sys/types.h $i_grp grp.h"
        case "$endgrent_r_proto" in
        '')     try='extern int endgrent_r(FILE**);'
                ./protochk "$try" $hdrs && endgrent_r_proto=I_H;

diff --git a/U/threads/d_endhostent_r.U b/U/threads/d_endhostent_r.U
index 245f11c..b04ec5a 100644 (file)
--- a/U/threads/d_endhostent_r.U
+++ b/U/threads/d_endhostent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_endhostent_r endhostent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_endhostent_r endhostent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_endhostent_r:
 ?S:     This variable conditionally defines the HAS_ENDHOSTENT_R symbol,
@@ -26,7 +26,7 @@ set endhostent_r d_endhostent_r
 eval $inlibc
 case "$d_endhostent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$endhostent_r_proto" in
        '')     try='extern int endhostent_r(struct hostent_data*);'
                ./protochk "$try" $hdrs && endhostent_r_proto=I_S;

diff --git a/U/threads/d_endnetent_r.U b/U/threads/d_endnetent_r.U
index 7ccdcb9..ddb4d7b 100644 (file)
--- a/U/threads/d_endnetent_r.U
+++ b/U/threads/d_endnetent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_endnetent_r endnetent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_endnetent_r endnetent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_endnetent_r:
 ?S:     This variable conditionally defines the HAS_ENDNETENT_R symbol,
@@ -26,7 +26,7 @@ set endnetent_r d_endnetent_r
 eval $inlibc
 case "$d_endnetent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$endnetent_r_proto" in
        '')     try='extern int endnetent_r(struct netent_data*);'
                ./protochk "$try" $hdrs && endnetent_r_proto=I_S;

diff --git a/U/threads/d_endprotoent_r.U b/U/threads/d_endprotoent_r.U
index e3a9387..331e1e0 100644 (file)
--- a/U/threads/d_endprotoent_r.U
+++ b/U/threads/d_endprotoent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_endprotoent_r endprotoent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_endprotoent_r endprotoent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_endprotoent_r:
 ?S:     This variable conditionally defines the HAS_ENDPROTOENT_R symbol,
@@ -26,7 +26,7 @@ set endprotoent_r d_endprotoent_r
 eval $inlibc
 case "$d_endprotoent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$endprotoent_r_proto" in
        '')     try='extern int endprotoent_r(struct protoent_data*);'
                ./protochk "$try" $hdrs && endprotoent_r_proto=I_S;

diff --git a/U/threads/d_endpwent_r.U b/U/threads/d_endpwent_r.U
index e7cefc3..5e26a5a 100644 (file)
--- a/U/threads/d_endpwent_r.U
+++ b/U/threads/d_endpwent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_endpwent_r endpwent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_endpwent_r endpwent_r_proto: Inlibc Protochk i_systypes i_pwd
 ?MAKE:  -pick add $@ %<
 ?S:d_endpwent_r:
 ?S:     This variable conditionally defines the HAS_ENDPWENT_R symbol,
@@ -26,7 +26,7 @@ set endpwent_r d_endpwent_r
 eval $inlibc
 case "$d_endpwent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_pwd pwd.h"
+       hdrs="$i_systypes sys/types.h $i_pwd pwd.h"
        case "$endpwent_r_proto" in
        '')     try='extern int endpwent_r(FILE**);'
                ./protochk "$try" $hdrs && endpwent_r_proto=I_H;

diff --git a/U/threads/d_endservent_r.U b/U/threads/d_endservent_r.U
index 55b69d3..ff3058c 100644 (file)
--- a/U/threads/d_endservent_r.U
+++ b/U/threads/d_endservent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_endservent_r endservent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_endservent_r endservent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_endservent_r:
 ?S:     This variable conditionally defines the HAS_ENDSERVENT_R symbol,
@@ -26,7 +26,7 @@ set endservent_r d_endservent_r
 eval $inlibc
 case "$d_endservent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$endservent_r_proto" in
        '')     try='extern int endservent_r(struct servent_data*);'
                ./protochk "$try" $hdrs && endservent_r_proto=I_S;

diff --git a/U/threads/d_getgrent_r.U b/U/threads/d_getgrent_r.U
index efd6445..09bf378 100644 (file)
--- a/U/threads/d_getgrent_r.U
+++ b/U/threads/d_getgrent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getgrent_r getgrent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getgrent_r getgrent_r_proto: Inlibc Protochk i_systypes i_grp
 ?MAKE:  -pick add $@ %<
 ?S:d_getgrent_r:
 ?S:     This variable conditionally defines the HAS_GETGRENT_R symbol,
@@ -26,7 +26,7 @@ set getgrent_r d_getgrent_r
 eval $inlibc
 case "$d_getgrent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_grp grp.h"
+       hdrs="$i_systypes sys/types.h $i_grp grp.h"
        case "$getgrent_r_proto" in
        '')     try='extern int getgrent_r(struct group*, char*, size_t, struct group**);'
                ./protochk "$try" $hdrs && getgrent_r_proto=I_SBWR;

diff --git a/U/threads/d_getgrgid_r.U b/U/threads/d_getgrgid_r.U
index 7babc68..82e17a8 100644 (file)
--- a/U/threads/d_getgrgid_r.U
+++ b/U/threads/d_getgrgid_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getgrgid_r getgrgid_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getgrgid_r getgrgid_r_proto: Inlibc Protochk i_systypes i_grp
 ?MAKE:  -pick add $@ %<
 ?S:d_getgrgid_r:
 ?S:     This variable conditionally defines the HAS_GETGRGID_R symbol,
@@ -26,7 +26,7 @@ set getgrgid_r d_getgrgid_r
 eval $inlibc
 case "$d_getgrgid_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_grp grp.h"
+       hdrs="$i_systypes sys/types.h $i_grp grp.h"
        case "$getgrgid_r_proto" in
        '')     try='extern int getgrgid_r(gid_t, struct group*, char*, size_t, struct group**);'
                ./protochk "$try" $hdrs && getgrgid_r_proto=I_TSBWR;

diff --git a/U/threads/d_getgrnam_r.U b/U/threads/d_getgrnam_r.U
index 31c8035..65bd453 100644 (file)
--- a/U/threads/d_getgrnam_r.U
+++ b/U/threads/d_getgrnam_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getgrnam_r getgrnam_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getgrnam_r getgrnam_r_proto: Inlibc Protochk i_systypes i_grp
 ?MAKE:  -pick add $@ %<
 ?S:d_getgrnam_r:
 ?S:     This variable conditionally defines the HAS_GETGRNAM_R symbol,
@@ -26,7 +26,7 @@ set getgrnam_r d_getgrnam_r
 eval $inlibc
 case "$d_getgrnam_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_grp grp.h"
+       hdrs="$i_systypes sys/types.h $i_grp grp.h"
        case "$getgrnam_r_proto" in
        '')     try='extern int getgrnam_r(const char*, struct group*, char*, size_t, struct group**);'
                ./protochk "$try" $hdrs && getgrnam_r_proto=I_CSBWR;

diff --git a/U/threads/d_gethbyaddr_r.U b/U/threads/d_gethbyaddr_r.U
deleted file mode 100644 (file)
index b5c451b..0000000
--- a/U/threads/d_gethbyaddr_r.U
+++ /dev/null
@@ -1,25 +0,0 @@
-?RCS: $Id$
-?RCS:
-?RCS: Copyright (c) 1999 Jarkko Hietaniemi
-?RCS:
-?RCS: You may distribute under the terms of either the GNU General Public
-?RCS: License or the Artistic License, as specified in the README file.
-?RCS:
-?MAKE:d_gethbyaddr_r: Inlibc
-?MAKE: -pick add $@ %<
-?S:d_gethbyaddr_r:
-?S:    This variable conditionally defines the HAS_GETHOSTBYADDR_R symbol,
-?S:    which indicates to the C program that the gethostbyaddr_r()
-?S:    routine is available.
-?S:.
-?C:HAS_GETHOSTBYADDR_R:
-?C:    This symbol, if defined, indicates that the gethostbyaddr_r routine
-?C:    is available to gethostbyaddr re-entrantly.
-?C:.
-?H:#$d_gethbyaddr_r HAS_GETHOSTBYADDR_R                /**/
-?H:.
-?LINT:set d_gethbyaddr_r
-: see if gethostbyaddr_r exists
-set gethostbyaddr_r d_gethbyaddr_r
-eval $inlibc
-

diff --git a/U/threads/d_gethbyname_r.U b/U/threads/d_gethbyname_r.U
deleted file mode 100644 (file)
index 580f040..0000000
--- a/U/threads/d_gethbyname_r.U
+++ /dev/null
@@ -1,25 +0,0 @@
-?RCS: $Id$
-?RCS:
-?RCS: Copyright (c) 1999 Jarkko Hietaniemi
-?RCS:
-?RCS: You may distribute under the terms of either the GNU General Public
-?RCS: License or the Artistic License, as specified in the README file.
-?RCS:
-?MAKE:d_gethbyname_r: Inlibc
-?MAKE: -pick add $@ %<
-?S:d_gethbyname_r:
-?S:    This variable conditionally defines the HAS_GETHOSTBYNAME_R symbol,
-?S:    which indicates to the C program that the gethostbyname_r()
-?S:    routine is available.
-?S:.
-?C:HAS_GETHOSTBYNAME_R:
-?C:    This symbol, if defined, indicates that the gethostbyname_r routine
-?C:    is available to gethostbyname re-entrantly.
-?C:.
-?H:#$d_gethbyname_r HAS_GETHOSTBYNAME_R                /**/
-?H:.
-?LINT:set d_gethbyname_r
-: see if gethostbyname_r exists
-set gethostbyname_r d_gethbyname_r
-eval $inlibc
-

diff --git a/U/threads/d_gethostbyaddr_r.U b/U/threads/d_gethostbyaddr_r.U
index 862f272..4033e55 100644 (file)
--- a/U/threads/d_gethostbyaddr_r.U
+++ b/U/threads/d_gethostbyaddr_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_gethostbyaddr_r gethostbyaddr_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_gethostbyaddr_r gethostbyaddr_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_gethostbyaddr_r:
 ?S:     This variable conditionally defines the HAS_GETHOSTBYADDR_R symbol,
@@ -26,7 +26,7 @@ set gethostbyaddr_r d_gethostbyaddr_r
 eval $inlibc
 case "$d_gethostbyaddr_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$gethostbyaddr_r_proto" in
        '')     try='extern int gethostbyaddr_r(const char*, size_t, int, struct hostent*, char*, struct hostent**, int*);'
                ./protochk "$try" $hdrs && gethostbyaddr_r_proto=I_CWISBRE;

diff --git a/U/threads/d_gethostbyname_r.U b/U/threads/d_gethostbyname_r.U
index bbe3932..6a5aeab 100644 (file)
--- a/U/threads/d_gethostbyname_r.U
+++ b/U/threads/d_gethostbyname_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_gethostbyname_r gethostbyname_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_gethostbyname_r gethostbyname_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_gethostbyname_r:
 ?S:     This variable conditionally defines the HAS_GETHOSTBYNAME_R symbol,
@@ -26,7 +26,7 @@ set gethostbyname_r d_gethostbyname_r
 eval $inlibc
 case "$d_gethostbyname_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$gethostbyname_r_proto" in
        '')     try='extern int gethostbyname_r(const char*, struct hostent*, char*, size_t, struct hostent**, int*);'
                ./protochk "$try" $hdrs && gethostbyname_r_proto=I_CSBWRE;

diff --git a/U/threads/d_gethostent_r.U b/U/threads/d_gethostent_r.U
index 7d27677..0159dd8 100644 (file)
--- a/U/threads/d_gethostent_r.U
+++ b/U/threads/d_gethostent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_gethostent_r gethostent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_gethostent_r gethostent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_gethostent_r:
 ?S:     This variable conditionally defines the HAS_GETHOSTENT_R symbol,
@@ -26,7 +26,7 @@ set gethostent_r d_gethostent_r
 eval $inlibc
 case "$d_gethostent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$gethostent_r_proto" in
        '')     try='extern int gethostent_r(struct hostent*, char*, size_t, struct hostent**, int*);'
                ./protochk "$try" $hdrs && gethostent_r_proto=I_SBWRE;

diff --git a/U/threads/d_getlogin_r.U b/U/threads/d_getlogin_r.U
index 23980f5..5bb2c6c 100644 (file)
--- a/U/threads/d_getlogin_r.U
+++ b/U/threads/d_getlogin_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getlogin_r getlogin_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getlogin_r getlogin_r_proto: Inlibc Protochk i_systypes i_unistd
 ?MAKE:  -pick add $@ %<
 ?S:d_getlogin_r:
 ?S:     This variable conditionally defines the HAS_GETLOGIN_R symbol,
@@ -26,7 +26,7 @@ set getlogin_r d_getlogin_r
 eval $inlibc
 case "$d_getlogin_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
        case "$getlogin_r_proto" in
        '')     try='extern int getlogin_r(char*, size_t);'
                ./protochk "$try" $hdrs && getlogin_r_proto=I_AW;

diff --git a/U/threads/d_getnetbyaddr_r.U b/U/threads/d_getnetbyaddr_r.U
index be291e5..cb85a23 100644 (file)
--- a/U/threads/d_getnetbyaddr_r.U
+++ b/U/threads/d_getnetbyaddr_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getnetbyaddr_r getnetbyaddr_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getnetbyaddr_r getnetbyaddr_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_getnetbyaddr_r:
 ?S:     This variable conditionally defines the HAS_GETNETBYADDR_R symbol,
@@ -26,7 +26,7 @@ set getnetbyaddr_r d_getnetbyaddr_r
 eval $inlibc
 case "$d_getnetbyaddr_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$getnetbyaddr_r_proto" in
        '')     try='extern int getnetbyaddr_r(long, int, struct netent*, char*, size_t, struct netent**, int*);'
                ./protochk "$try" $hdrs && getnetbyaddr_r_proto=I_LISBWRE;

diff --git a/U/threads/d_getnetbyname_r.U b/U/threads/d_getnetbyname_r.U
index dd0052e..182658f 100644 (file)
--- a/U/threads/d_getnetbyname_r.U
+++ b/U/threads/d_getnetbyname_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getnetbyname_r getnetbyname_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getnetbyname_r getnetbyname_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_getnetbyname_r:
 ?S:     This variable conditionally defines the HAS_GETNETBYNAME_R symbol,
@@ -26,7 +26,7 @@ set getnetbyname_r d_getnetbyname_r
 eval $inlibc
 case "$d_getnetbyname_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$getnetbyname_r_proto" in
        '')     try='extern int getnetbyname_r(const char*, int, struct netent*, char*, size_t, struct netent**, int*);'
                ./protochk "$try" $hdrs && getnetbyname_r_proto=I_CISBWRE;

diff --git a/U/threads/d_getnetent_r.U b/U/threads/d_getnetent_r.U
index decfb54..dd30f0f 100644 (file)
--- a/U/threads/d_getnetent_r.U
+++ b/U/threads/d_getnetent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getnetent_r getnetent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getnetent_r getnetent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_getnetent_r:
 ?S:     This variable conditionally defines the HAS_GETNETENT_R symbol,
@@ -26,7 +26,7 @@ set getnetent_r d_getnetent_r
 eval $inlibc
 case "$d_getnetent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$getnetent_r_proto" in
        '')     try='extern int getnetent_r(struct netent*, char*, size_t, struct netent**, int*);'
                ./protochk "$try" $hdrs && getnetent_r_proto=I_SBWRE;

diff --git a/U/threads/d_getprotobyname_r.U b/U/threads/d_getprotobyname_r.U
index 2098c5b..16825e8 100644 (file)
--- a/U/threads/d_getprotobyname_r.U
+++ b/U/threads/d_getprotobyname_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getprotobyname_r getprotobyname_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getprotobyname_r getprotobyname_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_getprotobyname_r:
 ?S:     This variable conditionally defines the HAS_GETPROTOBYNAME_R symbol,
@@ -26,7 +26,7 @@ set getprotobyname_r d_getprotobyname_r
 eval $inlibc
 case "$d_getprotobyname_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$getprotobyname_r_proto" in
        '')     try='extern int getprotobyname_r(const char*, struct protoent*, size_t, char*, struct protoent**);'
                ./protochk "$try" $hdrs && getprotobyname_r_proto=I_CSWBR;

diff --git a/U/threads/d_getprotobynumber_r.U b/U/threads/d_getprotobynumber_r.U
index d022d3e..aeaf2c4 100644 (file)
--- a/U/threads/d_getprotobynumber_r.U
+++ b/U/threads/d_getprotobynumber_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getprotobynumber_r getprotobynumber_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getprotobynumber_r getprotobynumber_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_getprotobynumber_r:
 ?S:     This variable conditionally defines the HAS_GETPROTOBYNUMBER_R symbol,
@@ -26,7 +26,7 @@ set getprotobynumber_r d_getprotobynumber_r
 eval $inlibc
 case "$d_getprotobynumber_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$getprotobynumber_r_proto" in
        '')     try='extern int getprotobynumber_r(int, char*, struct protoent*, size_t, struct protoent**);'
                ./protochk "$try" $hdrs && getprotobynumber_r_proto=I_IBSWR;

diff --git a/U/threads/d_getprotoent_r.U b/U/threads/d_getprotoent_r.U
index bf64f8a..24b008e 100644 (file)
--- a/U/threads/d_getprotoent_r.U
+++ b/U/threads/d_getprotoent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getprotoent_r getprotoent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getprotoent_r getprotoent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_getprotoent_r:
 ?S:     This variable conditionally defines the HAS_GETPROTOENT_R symbol,
@@ -26,7 +26,7 @@ set getprotoent_r d_getprotoent_r
 eval $inlibc
 case "$d_getprotoent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$getprotoent_r_proto" in
        '')     try='extern int getprotoent_r(struct protoent*, char*, size_t, struct protoent**);'
                ./protochk "$try" $hdrs && getprotoent_r_proto=I_SBWR;

diff --git a/U/threads/d_getpwent_r.U b/U/threads/d_getpwent_r.U
index b8cd351..059ab51 100644 (file)
--- a/U/threads/d_getpwent_r.U
+++ b/U/threads/d_getpwent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getpwent_r getpwent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getpwent_r getpwent_r_proto: Inlibc Protochk i_systypes i_pwd
 ?MAKE:  -pick add $@ %<
 ?S:d_getpwent_r:
 ?S:     This variable conditionally defines the HAS_GETPWENT_R symbol,
@@ -26,7 +26,7 @@ set getpwent_r d_getpwent_r
 eval $inlibc
 case "$d_getpwent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_pwd pwd.h"
+       hdrs="$i_systypes sys/types.h $i_pwd pwd.h"
        case "$getpwent_r_proto" in
        '')     try='extern int getpwent_r(struct passwd*, char*, size_t, struct passwd**);'
                ./protochk "$try" $hdrs && getpwent_r_proto=I_SBWR;

diff --git a/U/threads/d_getpwnam_r.U b/U/threads/d_getpwnam_r.U
index c5245ff..8ae1192 100644 (file)
--- a/U/threads/d_getpwnam_r.U
+++ b/U/threads/d_getpwnam_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getpwnam_r getpwnam_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getpwnam_r getpwnam_r_proto: Inlibc Protochk i_systypes i_pwd
 ?MAKE:  -pick add $@ %<
 ?S:d_getpwnam_r:
 ?S:     This variable conditionally defines the HAS_GETPWNAM_R symbol,
@@ -26,7 +26,7 @@ set getpwnam_r d_getpwnam_r
 eval $inlibc
 case "$d_getpwnam_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_pwd pwd.h"
+       hdrs="$i_systypes sys/types.h $i_pwd pwd.h"
        case "$getpwnam_r_proto" in
        '')     try='extern int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);'
                ./protochk "$try" $hdrs && getpwnam_r_proto=I_CSBWR;

diff --git a/U/threads/d_getpwuid_r.U b/U/threads/d_getpwuid_r.U
index 1683c63..257886d 100644 (file)
--- a/U/threads/d_getpwuid_r.U
+++ b/U/threads/d_getpwuid_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getpwuid_r getpwuid_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getpwuid_r getpwuid_r_proto: Inlibc Protochk i_systypes i_pwd
 ?MAKE:  -pick add $@ %<
 ?S:d_getpwuid_r:
 ?S:     This variable conditionally defines the HAS_GETPWUID_R symbol,
@@ -26,7 +26,7 @@ set getpwuid_r d_getpwuid_r
 eval $inlibc
 case "$d_getpwuid_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_pwd pwd.h"
+       hdrs="$i_systypes sys/types.h $i_pwd pwd.h"
        case "$getpwuid_r_proto" in
        '')     try='extern int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);'
                ./protochk "$try" $hdrs && getpwuid_r_proto=I_TSBWR;

diff --git a/U/threads/d_getservbyname_r.U b/U/threads/d_getservbyname_r.U
index d837ba0..441ee93 100644 (file)
--- a/U/threads/d_getservbyname_r.U
+++ b/U/threads/d_getservbyname_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getservbyname_r getservbyname_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getservbyname_r getservbyname_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_getservbyname_r:
 ?S:     This variable conditionally defines the HAS_GETSERVBYNAME_R symbol,
@@ -26,7 +26,7 @@ set getservbyname_r d_getservbyname_r
 eval $inlibc
 case "$d_getservbyname_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$getservbyname_r_proto" in
        '')     try='extern int getservbyname_r(const char*, const char*, struct servent*, char*, size_t, struct servent**);'
                ./protochk "$try" $hdrs && getservbyname_r_proto=I_CCSBWR;

diff --git a/U/threads/d_getservbyport_r.U b/U/threads/d_getservbyport_r.U
index e73ef97..ebb4021 100644 (file)
--- a/U/threads/d_getservbyport_r.U
+++ b/U/threads/d_getservbyport_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getservbyport_r getservbyport_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getservbyport_r getservbyport_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_getservbyport_r:
 ?S:     This variable conditionally defines the HAS_GETSERVBYPORT_R symbol,
@@ -26,7 +26,7 @@ set getservbyport_r d_getservbyport_r
 eval $inlibc
 case "$d_getservbyport_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$getservbyport_r_proto" in
        '')     try='extern int getservbyport_r(int, const char*, struct servent*, size_t, struct servent**);'
                ./protochk "$try" $hdrs && getservbyport_r_proto=I_ICSWR;

diff --git a/U/threads/d_getservent_r.U b/U/threads/d_getservent_r.U
index e634495..ab00809 100644 (file)
--- a/U/threads/d_getservent_r.U
+++ b/U/threads/d_getservent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getservent_r getservent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getservent_r getservent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_getservent_r:
 ?S:     This variable conditionally defines the HAS_GETSERVENT_R symbol,
@@ -26,7 +26,7 @@ set getservent_r d_getservent_r
 eval $inlibc
 case "$d_getservent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$getservent_r_proto" in
        '')     try='extern int getservent_r(struct servent*, char*, size_t, struct servent**);'
                ./protochk "$try" $hdrs && getservent_r_proto=I_SBWR;

diff --git a/U/threads/d_getspnam_r.U b/U/threads/d_getspnam_r.U
index f57e106..5c601ad 100644 (file)
--- a/U/threads/d_getspnam_r.U
+++ b/U/threads/d_getspnam_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_getspnam_r getspnam_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_getspnam_r getspnam_r_proto: Inlibc Protochk i_systypes i_shadow
 ?MAKE:  -pick add $@ %<
 ?S:d_getspnam_r:
 ?S:     This variable conditionally defines the HAS_GETSPNAM_R symbol,
@@ -26,7 +26,7 @@ set getspnam_r d_getspnam_r
 eval $inlibc
 case "$d_getspnam_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_shadow shadow.h"
+       hdrs="$i_systypes sys/types.h $i_shadow shadow.h"
        case "$getspnam_r_proto" in
        '')     try='extern int getspnam_r(const char*, struct spwd*, char*, size_t, struct spwd**);'
                ./protochk "$try" $hdrs && getspnam_r_proto=I_CSBWR;

diff --git a/U/threads/d_gmtime_r.U b/U/threads/d_gmtime_r.U
index f7c0803..2382da6 100644 (file)
--- a/U/threads/d_gmtime_r.U
+++ b/U/threads/d_gmtime_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_gmtime_r gmtime_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_gmtime_r gmtime_r_proto: Inlibc Protochk i_systypes i_time
 ?MAKE:  -pick add $@ %<
 ?S:d_gmtime_r:
 ?S:     This variable conditionally defines the HAS_GMTIME_R symbol,
@@ -26,7 +26,7 @@ set gmtime_r d_gmtime_r
 eval $inlibc
 case "$d_gmtime_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_time time.h"
+       hdrs="$i_systypes sys/types.h $i_time time.h"
        case "$gmtime_r_proto" in
        '')     try='extern struct tm* gmtime_r(const time_t*, struct tm*);'
                ./protochk "$try" $hdrs && gmtime_r_proto=S_TS;

diff --git a/U/threads/d_localtime_r.U b/U/threads/d_localtime_r.U
index 10ceeaf..e29d489 100644 (file)
--- a/U/threads/d_localtime_r.U
+++ b/U/threads/d_localtime_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_localtime_r localtime_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_localtime_r localtime_r_proto: Inlibc Protochk i_systypes i_time
 ?MAKE:  -pick add $@ %<
 ?S:d_localtime_r:
 ?S:     This variable conditionally defines the HAS_LOCALTIME_R symbol,
@@ -26,7 +26,7 @@ set localtime_r d_localtime_r
 eval $inlibc
 case "$d_localtime_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_time time.h"
+       hdrs="$i_systypes sys/types.h $i_time time.h"
        case "$localtime_r_proto" in
        '')     try='extern struct tm* localtime_r(const time_t*, struct tm*);'
                ./protochk "$try" $hdrs && localtime_r_proto=S_TS;

diff --git a/U/threads/d_random_r.U b/U/threads/d_random_r.U
index a9945e5..abc3e3f 100644 (file)
--- a/U/threads/d_random_r.U
+++ b/U/threads/d_random_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_random_r random_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_random_r random_r_proto: Inlibc Protochk i_systypes i_stdlib
 ?MAKE:  -pick add $@ %<
 ?S:d_random_r:
 ?S:     This variable conditionally defines the HAS_RANDOM_R symbol,
@@ -26,7 +26,7 @@ set random_r d_random_r
 eval $inlibc
 case "$d_random_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_stdlib stdlib.h"
+       hdrs="$i_systypes sys/types.h $i_stdlib stdlib.h"
        case "$random_r_proto" in
        '')     try='extern int random_r(int*, struct random_data*);'
                ./protochk "$try" $hdrs && random_r_proto=I_TS;

diff --git a/U/threads/d_readdir64_r.U b/U/threads/d_readdir64_r.U
index c6fbf23..ab27712 100644 (file)
--- a/U/threads/d_readdir64_r.U
+++ b/U/threads/d_readdir64_r.U
@@ -26,7 +26,7 @@ set readdir64_r d_readdir64_r
 eval $inlibc
 case "$d_readdir64_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_dirent dirent.h"
+       hdrs="$i_systypes sys/types.h $i_dirent dirent.h"
        case "$readdir64_r_proto" in
        '')     try='extern int readdir64_r(DIR*, struct dirent64*, struct dirent64**);'
                ./protochk "$try" $hdrs && readdir64_r_proto=I_TSR;

diff --git a/U/threads/d_readdir_r.U b/U/threads/d_readdir_r.U
index 309e994..65b4096 100644 (file)
--- a/U/threads/d_readdir_r.U
+++ b/U/threads/d_readdir_r.U
@@ -26,7 +26,7 @@ set readdir_r d_readdir_r
 eval $inlibc
 case "$d_readdir_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_dirent dirent.h"
+       hdrs="$i_systypes sys/types.h $i_dirent dirent.h"
        case "$readdir_r_proto" in
        '')     try='extern int readdir_r(DIR*, struct dirent*, struct dirent**);'
                ./protochk "$try" $hdrs && readdir_r_proto=I_TSR;

diff --git a/U/threads/d_setgrent_r.U b/U/threads/d_setgrent_r.U
index 7e1764b..51fcd11 100644 (file)
--- a/U/threads/d_setgrent_r.U
+++ b/U/threads/d_setgrent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_setgrent_r setgrent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_setgrent_r setgrent_r_proto: Inlibc Protochk i_systypes i_grp
 ?MAKE:  -pick add $@ %<
 ?S:d_setgrent_r:
 ?S:     This variable conditionally defines the HAS_SETGRENT_R symbol,
@@ -26,7 +26,7 @@ set setgrent_r d_setgrent_r
 eval $inlibc
 case "$d_setgrent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_grp grp.h"
+       hdrs="$i_systypes sys/types.h $i_grp grp.h"
        case "$setgrent_r_proto" in
        '')     try='extern int setgrent_r(FILE**);'
                ./protochk "$try" $hdrs && setgrent_r_proto=I_H;

diff --git a/U/threads/d_sethostent_r.U b/U/threads/d_sethostent_r.U
index 306a750..2d38a04 100644 (file)
--- a/U/threads/d_sethostent_r.U
+++ b/U/threads/d_sethostent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_sethostent_r sethostent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_sethostent_r sethostent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_sethostent_r:
 ?S:     This variable conditionally defines the HAS_SETHOSTENT_R symbol,
@@ -26,7 +26,7 @@ set sethostent_r d_sethostent_r
 eval $inlibc
 case "$d_sethostent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$sethostent_r_proto" in
        '')     try='extern int sethostent_r(int, struct hostent_data*);'
                ./protochk "$try" $hdrs && sethostent_r_proto=I_IS;

diff --git a/U/threads/d_setlocale_r.U b/U/threads/d_setlocale_r.U
index f81eeaf..fa16e35 100644 (file)
--- a/U/threads/d_setlocale_r.U
+++ b/U/threads/d_setlocale_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_setlocale_r setlocale_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_setlocale_r setlocale_r_proto: Inlibc Protochk i_systypes i_locale
 ?MAKE:  -pick add $@ %<
 ?S:d_setlocale_r:
 ?S:     This variable conditionally defines the HAS_SETLOCALE_R symbol,
@@ -26,7 +26,7 @@ set setlocale_r d_setlocale_r
 eval $inlibc
 case "$d_setlocale_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_locale locale.h"
+       hdrs="$i_systypes sys/types.h $i_locale locale.h"
        case "$setlocale_r_proto" in
        '')     try='extern int setlocale_r(int, const char*, char*, int);'
                ./protochk "$try" $hdrs && setlocale_r_proto=I_ICBI;

diff --git a/U/threads/d_setnetent_r.U b/U/threads/d_setnetent_r.U
index a909976..0f1d985 100644 (file)
--- a/U/threads/d_setnetent_r.U
+++ b/U/threads/d_setnetent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_setnetent_r setnetent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_setnetent_r setnetent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_setnetent_r:
 ?S:     This variable conditionally defines the HAS_SETNETENT_R symbol,
@@ -26,7 +26,7 @@ set setnetent_r d_setnetent_r
 eval $inlibc
 case "$d_setnetent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$setnetent_r_proto" in
        '')     try='extern int setnetent_r(int, struct netent_data*);'
                ./protochk "$try" $hdrs && setnetent_r_proto=I_IS;

diff --git a/U/threads/d_setprotoent_r.U b/U/threads/d_setprotoent_r.U
index eecd4d7..16243d3 100644 (file)
--- a/U/threads/d_setprotoent_r.U
+++ b/U/threads/d_setprotoent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_setprotoent_r setprotoent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_setprotoent_r setprotoent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_setprotoent_r:
 ?S:     This variable conditionally defines the HAS_SETPROTOENT_R symbol,
@@ -26,7 +26,7 @@ set setprotoent_r d_setprotoent_r
 eval $inlibc
 case "$d_setprotoent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$setprotoent_r_proto" in
        '')     try='extern int setprotoent_r(int, struct protoent_data*);'
                ./protochk "$try" $hdrs && setprotoent_r_proto=I_IS;

diff --git a/U/threads/d_setpwent_r.U b/U/threads/d_setpwent_r.U
index e310a4e..4e2478d 100644 (file)
--- a/U/threads/d_setpwent_r.U
+++ b/U/threads/d_setpwent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_setpwent_r setpwent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_setpwent_r setpwent_r_proto: Inlibc Protochk i_systypes i_pwd
 ?MAKE:  -pick add $@ %<
 ?S:d_setpwent_r:
 ?S:     This variable conditionally defines the HAS_SETPWENT_R symbol,
@@ -26,7 +26,7 @@ set setpwent_r d_setpwent_r
 eval $inlibc
 case "$d_setpwent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_pwd pwd.h"
+       hdrs="$i_systypes sys/types.h $i_pwd pwd.h"
        case "$setpwent_r_proto" in
        '')     try='extern int setpwent_r(FILE**);'
                ./protochk "$try" $hdrs && setpwent_r_proto=I_H;

diff --git a/U/threads/d_setservent_r.U b/U/threads/d_setservent_r.U
index e3c35b6..fdb6da6 100644 (file)
--- a/U/threads/d_setservent_r.U
+++ b/U/threads/d_setservent_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_setservent_r setservent_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_setservent_r setservent_r_proto: Inlibc Protochk i_systypes i_netdb
 ?MAKE:  -pick add $@ %<
 ?S:d_setservent_r:
 ?S:     This variable conditionally defines the HAS_SETSERVENT_R symbol,
@@ -26,7 +26,7 @@ set setservent_r d_setservent_r
 eval $inlibc
 case "$d_setservent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_netdb netdb.h"
+       hdrs="$i_systypes sys/types.h $i_netdb netdb.h"
        case "$setservent_r_proto" in
        '')     try='extern int setservent_r(int, struct servent_data*);'
                ./protochk "$try" $hdrs && setservent_r_proto=I_IS;

diff --git a/U/threads/d_srand48_r.U b/U/threads/d_srand48_r.U
index 628a6ff..a66a619 100644 (file)
--- a/U/threads/d_srand48_r.U
+++ b/U/threads/d_srand48_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_srand48_r srand48_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_srand48_r srand48_r_proto: Inlibc Protochk i_systypes i_stdlib
 ?MAKE:  -pick add $@ %<
 ?S:d_srand48_r:
 ?S:     This variable conditionally defines the HAS_SRAND48_R symbol,
@@ -26,7 +26,7 @@ set srand48_r d_srand48_r
 eval $inlibc
 case "$d_srand48_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_stdlib stdlib.h"
+       hdrs="$i_systypes sys/types.h $i_stdlib stdlib.h"
        case "$srand48_r_proto" in
        '')     try='extern int srand48_r(long, struct drand48_data*);'
                ./protochk "$try" $hdrs && srand48_r_proto=I_LS;

diff --git a/U/threads/d_srandom_r.U b/U/threads/d_srandom_r.U
index e0ef9d2..d3d22a9 100644 (file)
--- a/U/threads/d_srandom_r.U
+++ b/U/threads/d_srandom_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_srandom_r srandom_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_srandom_r srandom_r_proto: Inlibc Protochk i_systypes i_stdlib
 ?MAKE:  -pick add $@ %<
 ?S:d_srandom_r:
 ?S:     This variable conditionally defines the HAS_SRANDOM_R symbol,
@@ -26,7 +26,7 @@ set srandom_r d_srandom_r
 eval $inlibc
 case "$d_srandom_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_stdlib stdlib.h"
+       hdrs="$i_systypes sys/types.h $i_stdlib stdlib.h"
        case "$srandom_r_proto" in
        '')     try='extern int srandom_r(unsigned int, struct random_data*);'
                ./protochk "$try" $hdrs && srandom_r_proto=I_TS;

diff --git a/U/threads/d_strerror_r.U b/U/threads/d_strerror_r.U
index f943627..d536f06 100644 (file)
--- a/U/threads/d_strerror_r.U
+++ b/U/threads/d_strerror_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_strerror_r strerror_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_strerror_r strerror_r_proto: Inlibc Protochk i_systypes i_string
 ?MAKE:  -pick add $@ %<
 ?S:d_strerror_r:
 ?S:     This variable conditionally defines the HAS_STRERROR_R symbol,
@@ -26,7 +26,7 @@ set strerror_r d_strerror_r
 eval $inlibc
 case "$d_strerror_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_string string.h"
+       hdrs="$i_systypes sys/types.h $i_string string.h"
        case "$strerror_r_proto" in
        '')     try='extern int strerror_r(int, char*, size_t);'
                ./protochk "$try" $hdrs && strerror_r_proto=I_IBW;

diff --git a/U/threads/d_tmpnam_r.U b/U/threads/d_tmpnam_r.U
index 878e1a8..2ac71d1 100644 (file)
--- a/U/threads/d_tmpnam_r.U
+++ b/U/threads/d_tmpnam_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_tmpnam_r tmpnam_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_tmpnam_r tmpnam_r_proto: Inlibc Protochk i_systypes i_stdio
 ?MAKE:  -pick add $@ %<
 ?S:d_tmpnam_r:
 ?S:     This variable conditionally defines the HAS_TMPNAM_R symbol,
@@ -26,7 +26,7 @@ set tmpnam_r d_tmpnam_r
 eval $inlibc
 case "$d_tmpnam_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_stdio stdio.h"
+       hdrs="$i_systypes sys/types.h $i_stdio stdio.h"
        case "$tmpnam_r_proto" in
        '')     try='extern char* tmpnam_r(char*);'
                ./protochk "$try" $hdrs && tmpnam_r_proto=B_B;

diff --git a/U/threads/d_ttyname_r.U b/U/threads/d_ttyname_r.U
index 9642f10..6293f3e 100644 (file)
--- a/U/threads/d_ttyname_r.U
+++ b/U/threads/d_ttyname_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_ttyname_r ttyname_r_proto: Inlibc Protochk i_systypes i_dirent
+?MAKE:d_ttyname_r ttyname_r_proto: Inlibc Protochk i_systypes i_unistd
 ?MAKE:  -pick add $@ %<
 ?S:d_ttyname_r:
 ?S:     This variable conditionally defines the HAS_TTYNAME_R symbol,
@@ -26,7 +26,7 @@ set ttyname_r d_ttyname_r
 eval $inlibc
 case "$d_ttyname_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h ${i}_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
        case "$ttyname_r_proto" in
        '')     try='extern int ttyname_r(int, char*, size_t);'
                ./protochk "$try" $hdrs && ttyname_r_proto=I_IBW;