metaconfig: new round of the _r units.

p4raw-id: //depot/metaconfig@15227

diff --git a/U/perl/i_crypt.U b/U/perl/i_crypt.U
new file mode 100644 (file)
index 0000000..0a9e00d
--- /dev/null
+++ b/U/perl/i_crypt.U
@@ -0,0 +1,24 @@
+?RCS: $Id: i_crypt.U,v $
+?RCS:
+?RCS: Copyright (c) 2002 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:i_crypt: Inhdr Hasfield
+?MAKE: -pick add $@ %<
+?S:i_crypt:
+?S:    This variable conditionally defines the I_CRYPT symbol, and indicates
+?S:    whether a C program should include <crypt.h>.
+?S:.
+?C:I_CRYPT:
+?C:    This symbol, if defined, indicates that <crypt.h> exists and
+?C:    should be included.
+?C:.
+?H:#$i_crypt   I_CRYPT         /**/
+?H:.
+?LINT:set i_crypt
+: see if this is a crypt.h system
+set crypt.h i_crypt
+eval $inhdr
+

diff --git a/U/threads/d_asctime_r.U b/U/threads/d_asctime_r.U
index d03f043..ff8ee5d 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_unistd
+?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,30 +26,31 @@ set asctime_r d_asctime_r
 eval $inlibc
 case "$d_asctime_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='char* asctime_r(const struct tm*, char*);'
+       ./protochk "extern $try" $hdrs && asctime_r_proto=B_SB ;;
        esac
        case "$asctime_r_proto" in
-       '')     try='extern char* asctime_r(const struct tm*, char*, int);'
-               ./protochk "$try" $hdrs && asctime_r_proto=B_SBI;
-       ;;
+       '') try='char* asctime_r(const struct tm*, char*, int);'
+       ./protochk "extern $try" $hdrs && asctime_r_proto=B_SBI ;;
        esac
        case "$asctime_r_proto" in
-       '')     try='extern int asctime_r(const struct tm*, char*);'
-               ./protochk "$try" $hdrs && asctime_r_proto=I_SB;
-       ;;
+       '') try='int asctime_r(const struct tm*, char*);'
+       ./protochk "extern $try" $hdrs && asctime_r_proto=I_SB ;;
        esac
        case "$asctime_r_proto" in
-       '')     try='extern int asctime_r(const struct tm*, char*, int);'
-               ./protochk "$try" $hdrs && asctime_r_proto=I_SBI;
-       ;;
+       '') try='int asctime_r(const struct tm*, char*, int);'
+       ./protochk "extern $try" $hdrs && asctime_r_proto=I_SBI ;;
        esac
        case "$asctime_r_proto" in
-       '') d_asctime_r=undef ; echo "Disabling asctime_r, cannot find prototype." ;;
-       * ) asctime_r_proto="REENTRANT_PROTO_$asctime_r_proto" ; echo "$try" ;;
+       '')     d_asctime_r=undef
+               echo "Disabling asctime_r, cannot determine prototype." ;;
+       * )     case "$asctime_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) asctime_r_proto="REENTRANT_PROTO_$asctime_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_crypt_r.U b/U/threads/d_crypt_r.U
index 8e76469..33ecc51 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_unistd
+?MAKE:d_crypt_r crypt_r_proto: Inlibc Protochk i_systypes i_crypt
 ?MAKE: -pick add $@ %<
 ?S:d_crypt_r:
 ?S:    This variable conditionally defines the HAS_CRYPT_R symbol,
@@ -26,15 +26,19 @@ 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 define stdio.h $i_crypt crypt.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;
-       ;;
+       '') try='char* crypt_r(const char*, const char*, struct crypt_data*);'
+       ./protochk "extern $try" $hdrs && crypt_r_proto=B_CCS ;;
        esac
        case "$crypt_r_proto" in
-       '') d_crypt_r=undef ; echo "Disabling crypt_r, cannot find prototype." ;;
-       * ) crypt_r_proto="REENTRANT_PROTO_$crypt_r_proto" ; echo "$try" ;;
+       '')     d_crypt_r=undef
+               echo "Disabling crypt_r, cannot determine prototype." ;;
+       * )     case "$crypt_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) crypt_r_proto="REENTRANT_PROTO_$crypt_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_ctermid_r.U b/U/threads/d_ctermid_r.U
index f3bae7f..47586ac 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_unistd
+?MAKE:d_ctermid_r ctermid_r_proto: Inlibc Protochk i_systypes 
 ?MAKE: -pick add $@ %<
 ?S:d_ctermid_r:
 ?S:    This variable conditionally defines the HAS_CTERMID_R symbol,
@@ -26,15 +26,19 @@ set ctermid_r d_ctermid_r
 eval $inlibc
 case "$d_ctermid_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.h $i_stdio stdio.h"
        case "$ctermid_r_proto" in
-       '')     try='extern char* ctermid_r(char*);'
-               ./protochk "$try" $hdrs && ctermid_r_proto=B_B;
-       ;;
+       '') try='char* ctermid_r(char*);'
+       ./protochk "extern $try" $hdrs && ctermid_r_proto=B_B ;;
        esac
        case "$ctermid_r_proto" in
-       '') d_ctermid_r=undef ; echo "Disabling ctermid_r, cannot find prototype." ;;
-       * ) ctermid_r_proto="REENTRANT_PROTO_$ctermid_r_proto" ; echo "$try" ;;
+       '')     d_ctermid_r=undef
+               echo "Disabling ctermid_r, cannot determine prototype." ;;
+       * )     case "$ctermid_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) ctermid_r_proto="REENTRANT_PROTO_$ctermid_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_ctime_r.U b/U/threads/d_ctime_r.U
index 9c7167e..ac2cf0f 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_unistd
+?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,30 +26,31 @@ set ctime_r d_ctime_r
 eval $inlibc
 case "$d_ctime_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='char* ctime_r(const time_t*, char*);'
+       ./protochk "extern $try" $hdrs && ctime_r_proto=B_SB ;;
        esac
        case "$ctime_r_proto" in
-       '')     try='extern char* ctime_r(const time_t*, char*, int);'
-               ./protochk "$try" $hdrs && ctime_r_proto=B_SBI;
-       ;;
+       '') try='char* ctime_r(const time_t*, char*, int);'
+       ./protochk "extern $try" $hdrs && ctime_r_proto=B_SBI ;;
        esac
        case "$ctime_r_proto" in
-       '')     try='extern int ctime_r(const time_t*, char*);'
-               ./protochk "$try" $hdrs && ctime_r_proto=I_SB;
-       ;;
+       '') try='int ctime_r(const time_t*, char*);'
+       ./protochk "extern $try" $hdrs && ctime_r_proto=I_SB ;;
        esac
        case "$ctime_r_proto" in
-       '')     try='extern int ctime_r(const time_t*, char*, int);'
-               ./protochk "$try" $hdrs && ctime_r_proto=I_SBI;
-       ;;
+       '') try='int ctime_r(const time_t*, char*, int);'
+       ./protochk "extern $try" $hdrs && ctime_r_proto=I_SBI ;;
        esac
        case "$ctime_r_proto" in
-       '') d_ctime_r=undef ; echo "Disabling ctime_r, cannot find prototype." ;;
-       * ) ctime_r_proto="REENTRANT_PROTO_$ctime_r_proto" ; echo "$try" ;;
+       '')     d_ctime_r=undef
+               echo "Disabling ctime_r, cannot determine prototype." ;;
+       * )     case "$ctime_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) ctime_r_proto="REENTRANT_PROTO_$ctime_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_drand48_r.U b/U/threads/d_drand48_r.U
index 90f6dac..3beda06 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_unistd
+?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,15 +26,19 @@ set drand48_r d_drand48_r
 eval $inlibc
 case "$d_drand48_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.h $i_stdlib stdlib.h"
        case "$drand48_r_proto" in
-       '')     try='extern int drand48_r(struct drand48_data*, double*);'
-               ./protochk "$try" $hdrs && drand48_r_proto=I_ST;
-       ;;
+       '') try='int drand48_r(struct drand48_data*, double*);'
+       ./protochk "extern $try" $hdrs && drand48_r_proto=I_ST ;;
        esac
        case "$drand48_r_proto" in
-       '') d_drand48_r=undef ; echo "Disabling drand48_r, cannot find prototype." ;;
-       * ) drand48_r_proto="REENTRANT_PROTO_$drand48_r_proto" ; echo "$try" ;;
+       '')     d_drand48_r=undef
+               echo "Disabling drand48_r, cannot determine prototype." ;;
+       * )     case "$drand48_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) drand48_r_proto="REENTRANT_PROTO_$drand48_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_endgrent_r.U b/U/threads/d_endgrent_r.U
index 4538815..41ead32 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_unistd
+?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,20 +26,23 @@ set endgrent_r d_endgrent_r
 eval $inlibc
 case "$d_endgrent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
        case "$endgrent_r_proto" in
-       '')     try='extern int endgrent_r(FILE**);'
-               ./protochk "$try" $hdrs && endgrent_r_proto=I_H;
-       ;;
+       '') try='int endgrent_r(FILE**);'
+       ./protochk "extern $try" $hdrs && endgrent_r_proto=I_H ;;
        esac
        case "$endgrent_r_proto" in
-       '')     try='extern void endgrent_r(FILE**);'
-               ./protochk "$try" $hdrs && endgrent_r_proto=V_H;
-       ;;
+       '') try='void endgrent_r(FILE**);'
+       ./protochk "extern $try" $hdrs && endgrent_r_proto=V_H ;;
        esac
        case "$endgrent_r_proto" in
-       '') d_endgrent_r=undef ; echo "Disabling endgrent_r, cannot find prototype." ;;
-       * ) endgrent_r_proto="REENTRANT_PROTO_$endgrent_r_proto" ; echo "$try" ;;
+       '')     d_endgrent_r=undef
+               echo "Disabling endgrent_r, cannot determine prototype." ;;
+       * )     case "$endgrent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) endgrent_r_proto="REENTRANT_PROTO_$endgrent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_endhostent_r.U b/U/threads/d_endhostent_r.U
index 048956d..d24d1a1 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_unistd
+?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,20 +26,23 @@ set endhostent_r d_endhostent_r
 eval $inlibc
 case "$d_endhostent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int endhostent_r(struct hostent_data*);'
+       ./protochk "extern $try" $hdrs && endhostent_r_proto=I_S ;;
        esac
        case "$endhostent_r_proto" in
-       '')     try='extern void endhostent_r(struct hostent_data*);'
-               ./protochk "$try" $hdrs && endhostent_r_proto=V_S;
-       ;;
+       '') try='void endhostent_r(struct hostent_data*);'
+       ./protochk "extern $try" $hdrs && endhostent_r_proto=V_S ;;
        esac
        case "$endhostent_r_proto" in
-       '') d_endhostent_r=undef ; echo "Disabling endhostent_r, cannot find prototype." ;;
-       * ) endhostent_r_proto="REENTRANT_PROTO_$endhostent_r_proto" ; echo "$try" ;;
+       '')     d_endhostent_r=undef
+               echo "Disabling endhostent_r, cannot determine prototype." ;;
+       * )     case "$endhostent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) endhostent_r_proto="REENTRANT_PROTO_$endhostent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_endnetent_r.U b/U/threads/d_endnetent_r.U
index bb80bd0..b586615 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_unistd
+?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,20 +26,23 @@ set endnetent_r d_endnetent_r
 eval $inlibc
 case "$d_endnetent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int endnetent_r(struct netent_data*);'
+       ./protochk "extern $try" $hdrs && endnetent_r_proto=I_S ;;
        esac
        case "$endnetent_r_proto" in
-       '')     try='extern void endnetent_r(struct netent_data*);'
-               ./protochk "$try" $hdrs && endnetent_r_proto=V_S;
-       ;;
+       '') try='void endnetent_r(struct netent_data*);'
+       ./protochk "extern $try" $hdrs && endnetent_r_proto=V_S ;;
        esac
        case "$endnetent_r_proto" in
-       '') d_endnetent_r=undef ; echo "Disabling endnetent_r, cannot find prototype." ;;
-       * ) endnetent_r_proto="REENTRANT_PROTO_$endnetent_r_proto" ; echo "$try" ;;
+       '')     d_endnetent_r=undef
+               echo "Disabling endnetent_r, cannot determine prototype." ;;
+       * )     case "$endnetent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) endnetent_r_proto="REENTRANT_PROTO_$endnetent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_endprotoent_r.U b/U/threads/d_endprotoent_r.U
index 6d6427e..1ef06e2 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_unistd
+?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,20 +26,23 @@ set endprotoent_r d_endprotoent_r
 eval $inlibc
 case "$d_endprotoent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int endprotoent_r(struct protoent_data*);'
+       ./protochk "extern $try" $hdrs && endprotoent_r_proto=I_S ;;
        esac
        case "$endprotoent_r_proto" in
-       '')     try='extern void endprotoent_r(struct protoent_data*);'
-               ./protochk "$try" $hdrs && endprotoent_r_proto=V_S;
-       ;;
+       '') try='void endprotoent_r(struct protoent_data*);'
+       ./protochk "extern $try" $hdrs && endprotoent_r_proto=V_S ;;
        esac
        case "$endprotoent_r_proto" in
-       '') d_endprotoent_r=undef ; echo "Disabling endprotoent_r, cannot find prototype." ;;
-       * ) endprotoent_r_proto="REENTRANT_PROTO_$endprotoent_r_proto" ; echo "$try" ;;
+       '')     d_endprotoent_r=undef
+               echo "Disabling endprotoent_r, cannot determine prototype." ;;
+       * )     case "$endprotoent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) endprotoent_r_proto="REENTRANT_PROTO_$endprotoent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_endpwent_r.U b/U/threads/d_endpwent_r.U
index ddeff28..196b9c1 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_unistd
+?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,20 +26,23 @@ set endpwent_r d_endpwent_r
 eval $inlibc
 case "$d_endpwent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
        case "$endpwent_r_proto" in
-       '')     try='extern int endpwent_r(FILE**);'
-               ./protochk "$try" $hdrs && endpwent_r_proto=I_H;
-       ;;
+       '') try='int endpwent_r(FILE**);'
+       ./protochk "extern $try" $hdrs && endpwent_r_proto=I_H ;;
        esac
        case "$endpwent_r_proto" in
-       '')     try='extern void endpwent_r(FILE**);'
-               ./protochk "$try" $hdrs && endpwent_r_proto=V_H;
-       ;;
+       '') try='void endpwent_r(FILE**);'
+       ./protochk "extern $try" $hdrs && endpwent_r_proto=V_H ;;
        esac
        case "$endpwent_r_proto" in
-       '') d_endpwent_r=undef ; echo "Disabling endpwent_r, cannot find prototype." ;;
-       * ) endpwent_r_proto="REENTRANT_PROTO_$endpwent_r_proto" ; echo "$try" ;;
+       '')     d_endpwent_r=undef
+               echo "Disabling endpwent_r, cannot determine prototype." ;;
+       * )     case "$endpwent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) endpwent_r_proto="REENTRANT_PROTO_$endpwent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_endservent_r.U b/U/threads/d_endservent_r.U
index a6cd3e2..09b11fb 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_unistd
+?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,20 +26,23 @@ set endservent_r d_endservent_r
 eval $inlibc
 case "$d_endservent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int endservent_r(struct servent_data*);'
+       ./protochk "extern $try" $hdrs && endservent_r_proto=I_S ;;
        esac
        case "$endservent_r_proto" in
-       '')     try='extern void endservent_r(struct servent_data*);'
-               ./protochk "$try" $hdrs && endservent_r_proto=V_S;
-       ;;
+       '') try='void endservent_r(struct servent_data*);'
+       ./protochk "extern $try" $hdrs && endservent_r_proto=V_S ;;
        esac
        case "$endservent_r_proto" in
-       '') d_endservent_r=undef ; echo "Disabling endservent_r, cannot find prototype." ;;
-       * ) endservent_r_proto="REENTRANT_PROTO_$endservent_r_proto" ; echo "$try" ;;
+       '')     d_endservent_r=undef
+               echo "Disabling endservent_r, cannot determine prototype." ;;
+       * )     case "$endservent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) endservent_r_proto="REENTRANT_PROTO_$endservent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getgrent_r.U b/U/threads/d_getgrent_r.U
index 7af623e..3e6a58d 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_unistd
+?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,30 +26,35 @@ set getgrent_r d_getgrent_r
 eval $inlibc
 case "$d_getgrent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getgrent_r(struct group*, char*, size_t, struct group**);'
+       ./protochk "extern $try" $hdrs && getgrent_r_proto=I_SBWR ;;
        esac
        case "$getgrent_r_proto" in
-       '')     try='extern int getgrent_r(struct group*, char*, int, struct group**);'
-               ./protochk "$try" $hdrs && getgrent_r_proto=I_SBIR;
-       ;;
+       '') try='int getgrent_r(struct group*, char*, int, struct group**);'
+       ./protochk "extern $try" $hdrs && getgrent_r_proto=I_SBIR ;;
        esac
        case "$getgrent_r_proto" in
-       '')     try='extern int getgrent_r(struct group*, char*, int);'
-               ./protochk "$try" $hdrs && getgrent_r_proto=I_SBI;
-       ;;
+       '') try='struct group* getgrent_r(struct group*, char*, int);'
+       ./protochk "extern $try" $hdrs && getgrent_r_proto=S_SBI ;;
        esac
        case "$getgrent_r_proto" in
-       '')     try='extern int getgrent_r(struct group*, char*, int, FILE**);'
-               ./protochk "$try" $hdrs && getgrent_r_proto=I_SBIH;
-       ;;
+       '') try='int getgrent_r(struct group*, char*, int);'
+       ./protochk "extern $try" $hdrs && getgrent_r_proto=I_SBI ;;
+       esac
+       case "$getgrent_r_proto" in
+       '') try='int getgrent_r(struct group*, char*, int, FILE**);'
+       ./protochk "extern $try" $hdrs && getgrent_r_proto=I_SBIH ;;
        esac
        case "$getgrent_r_proto" in
-       '') d_getgrent_r=undef ; echo "Disabling getgrent_r, cannot find prototype." ;;
-       * ) getgrent_r_proto="REENTRANT_PROTO_$getgrent_r_proto" ; echo "$try" ;;
+       '')     d_getgrent_r=undef
+               echo "Disabling getgrent_r, cannot determine prototype." ;;
+       * )     case "$getgrent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getgrent_r_proto="REENTRANT_PROTO_$getgrent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getgrgid_r.U b/U/threads/d_getgrgid_r.U
index f0e3e32..bc2e573 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_unistd
+?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,30 +26,31 @@ set getgrgid_r d_getgrgid_r
 eval $inlibc
 case "$d_getgrgid_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getgrgid_r(gid_t, struct group*, char*, size_t, struct group**);'
+       ./protochk "extern $try" $hdrs && getgrgid_r_proto=I_TSBWR ;;
        esac
        case "$getgrgid_r_proto" in
-       '')     try='extern int getgrgid_r(gid_t, struct group*, char*, int, struct group**);'
-               ./protochk "$try" $hdrs && getgrgid_r_proto=I_TSBIR;
-       ;;
+       '') try='int getgrgid_r(gid_t, struct group*, char*, int, struct group**);'
+       ./protochk "extern $try" $hdrs && getgrgid_r_proto=I_TSBIR ;;
        esac
        case "$getgrgid_r_proto" in
-       '')     try='extern int getgrgid_r(gid_t, struct group*, char*, int);'
-               ./protochk "$try" $hdrs && getgrgid_r_proto=I_TSBI;
-       ;;
+       '') try='int getgrgid_r(gid_t, struct group*, char*, int);'
+       ./protochk "extern $try" $hdrs && getgrgid_r_proto=I_TSBI ;;
        esac
        case "$getgrgid_r_proto" in
-       '')     try='extern struct group* getgrgid_r(gid_t, struct group*, char*, int);'
-               ./protochk "$try" $hdrs && getgrgid_r_proto=S_TSBI;
-       ;;
+       '') try='struct group* getgrgid_r(gid_t, struct group*, char*, int);'
+       ./protochk "extern $try" $hdrs && getgrgid_r_proto=S_TSBI ;;
        esac
        case "$getgrgid_r_proto" in
-       '') d_getgrgid_r=undef ; echo "Disabling getgrgid_r, cannot find prototype." ;;
-       * ) getgrgid_r_proto="REENTRANT_PROTO_$getgrgid_r_proto" ; echo "$try" ;;
+       '')     d_getgrgid_r=undef
+               echo "Disabling getgrgid_r, cannot determine prototype." ;;
+       * )     case "$getgrgid_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getgrgid_r_proto="REENTRANT_PROTO_$getgrgid_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getgrnam_r.U b/U/threads/d_getgrnam_r.U
index 974f455..dfb081f 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_unistd
+?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,30 +26,35 @@ set getgrnam_r d_getgrnam_r
 eval $inlibc
 case "$d_getgrnam_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getgrnam_r(const char*, struct group*, char*, size_t, struct group**);'
+       ./protochk "extern $try" $hdrs && getgrnam_r_proto=I_CSBWR ;;
        esac
        case "$getgrnam_r_proto" in
-       '')     try='extern int getgrnam_r(const char*, struct group*, char*, int, struct group**);'
-               ./protochk "$try" $hdrs && getgrnam_r_proto=I_CSBIR;
-       ;;
+       '') try='int getgrnam_r(const char*, struct group*, char*, int, struct group**);'
+       ./protochk "extern $try" $hdrs && getgrnam_r_proto=I_CSBIR ;;
        esac
        case "$getgrnam_r_proto" in
-       '')     try='extern int getgrnam_r(const char*, struct group*, char*, int);'
-               ./protochk "$try" $hdrs && getgrnam_r_proto=I_CSBI;
-       ;;
+       '') try='struct group* getgrnam_r(const char*, char*, int);'
+       ./protochk "extern $try" $hdrs && getgrnam_r_proto=S_CBI ;;
        esac
        case "$getgrnam_r_proto" in
-       '')     try='extern struct group* getgrnam_r(const char*, struct group*, char*, int);'
-               ./protochk "$try" $hdrs && getgrnam_r_proto=S_CSBI;
-       ;;
+       '') try='int getgrnam_r(const char*, struct group*, char*, int);'
+       ./protochk "extern $try" $hdrs && getgrnam_r_proto=I_CSBI ;;
+       esac
+       case "$getgrnam_r_proto" in
+       '') try='struct group* getgrnam_r(const char*, struct group*, char*, int);'
+       ./protochk "extern $try" $hdrs && getgrnam_r_proto=S_CSBI ;;
        esac
        case "$getgrnam_r_proto" in
-       '') d_getgrnam_r=undef ; echo "Disabling getgrnam_r, cannot find prototype." ;;
-       * ) getgrnam_r_proto="REENTRANT_PROTO_$getgrnam_r_proto" ; echo "$try" ;;
+       '')     d_getgrnam_r=undef
+               echo "Disabling getgrnam_r, cannot determine prototype." ;;
+       * )     case "$getgrnam_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getgrnam_r_proto="REENTRANT_PROTO_$getgrnam_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_gethostbyaddr_r.U b/U/threads/d_gethostbyaddr_r.U
index 4a372a2..d854084 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_unistd
+?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,40 +26,39 @@ set gethostbyaddr_r d_gethostbyaddr_r
 eval $inlibc
 case "$d_gethostbyaddr_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int gethostbyaddr_r(const char*, size_t, int, struct hostent*, char*, size_t, struct hostent**, int*);'
+       ./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_CWISBWRE ;;
        esac
        case "$gethostbyaddr_r_proto" in
-       '')     try='extern struct hostent* gethostbyaddr_r(const char*, size_t, int, struct hostent*, char*, int, int*);'
-               ./protochk "$try" $hdrs && gethostbyaddr_r_proto=S_CWISBIE;
-       ;;
+       '') try='struct hostent* gethostbyaddr_r(const char*, size_t, int, struct hostent*, char*, size_t, int, int*);'
+       ./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=S_CWISBWIE ;;
        esac
        case "$gethostbyaddr_r_proto" in
-       '')     try='extern struct hostent* gethostbyaddr_r(const char*, int, int, struct hostent*, char*, int, int*);'
-               ./protochk "$try" $hdrs && gethostbyaddr_r_proto=S_CIISBIE;
-       ;;
+       '') try='struct hostent* gethostbyaddr_r(const char*, int, int, struct hostent*, char*, int, int*);'
+       ./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=S_CIISBIE ;;
        esac
        case "$gethostbyaddr_r_proto" in
-       '')     try='extern int gethostbyaddr_r(const char*, size_t, int, struct hostent*, struct hostent);'
-               ./protochk "$try" $hdrs && gethostbyaddr_r_proto=I_CWISD;
-       ;;
+       '') try='int gethostbyaddr_r(const char*, size_t, int, struct hostent*, struct hostent_data*);'
+       ./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_CWISD ;;
        esac
        case "$gethostbyaddr_r_proto" in
-       '')     try='extern int gethostbyaddr_r(const char*, int, int, struct hostent*, struct hostent);'
-               ./protochk "$try" $hdrs && gethostbyaddr_r_proto=I_CIISD;
-       ;;
+       '') try='int gethostbyaddr_r(const char*, int, int, struct hostent*, struct hostent_data*);'
+       ./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_CIISD ;;
        esac
        case "$gethostbyaddr_r_proto" in
-       '')     try='extern int gethostbyaddr_r(const char*, int, int);'
-               ./protochk "$try" $hdrs && gethostbyaddr_r_proto=I_CII;
-       ;;
+       '') try='int gethostbyaddr_r(const char*, int, int);'
+       ./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_CII ;;
        esac
        case "$gethostbyaddr_r_proto" in
-       '') d_gethostbyaddr_r=undef ; echo "Disabling gethostbyaddr_r, cannot find prototype." ;;
-       * ) gethostbyaddr_r_proto="REENTRANT_PROTO_$gethostbyaddr_r_proto" ; echo "$try" ;;
+       '')     d_gethostbyaddr_r=undef
+               echo "Disabling gethostbyaddr_r, cannot determine prototype." ;;
+       * )     case "$gethostbyaddr_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) gethostbyaddr_r_proto="REENTRANT_PROTO_$gethostbyaddr_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_gethostbyname_r.U b/U/threads/d_gethostbyname_r.U
index 13cf055..8d68f9f 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_unistd
+?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,25 +26,27 @@ set gethostbyname_r d_gethostbyname_r
 eval $inlibc
 case "$d_gethostbyname_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int gethostbyname_r(const char*, struct hostent*, char*, size_t, struct hostent**, int*);'
+       ./protochk "extern $try" $hdrs && gethostbyname_r_proto=I_CSBWRE ;;
        esac
        case "$gethostbyname_r_proto" in
-       '')     try='extern struct hostent* gethostbyname_r(const char*, struct hostent*, char*, int, int*);'
-               ./protochk "$try" $hdrs && gethostbyname_r_proto=S_CSBIE;
-       ;;
+       '') try='struct hostent* gethostbyname_r(const char*, struct hostent*, char*, int, int*);'
+       ./protochk "extern $try" $hdrs && gethostbyname_r_proto=S_CSBIE ;;
        esac
        case "$gethostbyname_r_proto" in
-       '')     try='extern int gethostbyname_r(const char*, struct hostent*, struct hostent);'
-               ./protochk "$try" $hdrs && gethostbyname_r_proto=I_CSD;
-       ;;
+       '') try='int gethostbyname_r(const char*, struct hostent*, struct hostent_data*);'
+       ./protochk "extern $try" $hdrs && gethostbyname_r_proto=I_CSD ;;
        esac
        case "$gethostbyname_r_proto" in
-       '') d_gethostbyname_r=undef ; echo "Disabling gethostbyname_r, cannot find prototype." ;;
-       * ) gethostbyname_r_proto="REENTRANT_PROTO_$gethostbyname_r_proto" ; echo "$try" ;;
+       '')     d_gethostbyname_r=undef
+               echo "Disabling gethostbyname_r, cannot determine prototype." ;;
+       * )     case "$gethostbyname_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) gethostbyname_r_proto="REENTRANT_PROTO_$gethostbyname_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_gethostent_r.U b/U/threads/d_gethostent_r.U
index 51b69c4..ee19877 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_unistd
+?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,30 +26,35 @@ set gethostent_r d_gethostent_r
 eval $inlibc
 case "$d_gethostent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int gethostent_r(struct hostent*, char*, size_t, struct hostent**, int*);'
+       ./protochk "extern $try" $hdrs && gethostent_r_proto=I_SBWRE ;;
        esac
        case "$gethostent_r_proto" in
-       '')     try='extern int gethostent_r(struct hostent*, char*, int, int*);'
-               ./protochk "$try" $hdrs && gethostent_r_proto=I_SBIE;
-       ;;
+       '') try='int gethostent_r(struct hostent*, char*, int, int*);'
+       ./protochk "extern $try" $hdrs && gethostent_r_proto=I_SBIE ;;
        esac
        case "$gethostent_r_proto" in
-       '')     try='extern int gethostent_r(struct hostent*, char*, int);'
-               ./protochk "$try" $hdrs && gethostent_r_proto=I_SBI;
-       ;;
+       '') try='struct hostent* gethostent_r(struct hostent*, char*, int, int*);'
+       ./protochk "extern $try" $hdrs && gethostent_r_proto=S_SBIE ;;
        esac
        case "$gethostent_r_proto" in
-       '')     try='extern int gethostent_r(struct hostent*, struct hostent_data*);'
-               ./protochk "$try" $hdrs && gethostent_r_proto=I_SD;
-       ;;
+       '') try='int gethostent_r(struct hostent*, char*, int);'
+       ./protochk "extern $try" $hdrs && gethostent_r_proto=I_SBI ;;
+       esac
+       case "$gethostent_r_proto" in
+       '') try='int gethostent_r(struct hostent*, struct hostent_data*);'
+       ./protochk "extern $try" $hdrs && gethostent_r_proto=I_SD ;;
        esac
        case "$gethostent_r_proto" in
-       '') d_gethostent_r=undef ; echo "Disabling gethostent_r, cannot find prototype." ;;
-       * ) gethostent_r_proto="REENTRANT_PROTO_$gethostent_r_proto" ; echo "$try" ;;
+       '')     d_gethostent_r=undef
+               echo "Disabling gethostent_r, cannot determine prototype." ;;
+       * )     case "$gethostent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) gethostent_r_proto="REENTRANT_PROTO_$gethostent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getlogin_r.U b/U/threads/d_getlogin_r.U
index 402ac6b..756256f 100644 (file)
--- a/U/threads/d_getlogin_r.U
+++ b/U/threads/d_getlogin_r.U
@@ -26,20 +26,31 @@ 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 define stdio.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_BW;
-       ;;
+       '') try='int getlogin_r(char*, size_t);'
+       ./protochk "extern $try" $hdrs && getlogin_r_proto=I_BW ;;
        esac
        case "$getlogin_r_proto" in
-       '')     try='extern int getlogin_r(char*, int);'
-               ./protochk "$try" $hdrs && getlogin_r_proto=I_BI;
-       ;;
+       '') try='int getlogin_r(char*, int);'
+       ./protochk "extern $try" $hdrs && getlogin_r_proto=I_BI ;;
+       esac
+       case "$getlogin_r_proto" in
+       '') try='char* getlogin_r(char*, size_t);'
+       ./protochk "extern $try" $hdrs && getlogin_r_proto=B_BW ;;
+       esac
+       case "$getlogin_r_proto" in
+       '') try='char* getlogin_r(char*, int);'
+       ./protochk "extern $try" $hdrs && getlogin_r_proto=B_BI ;;
        esac
        case "$getlogin_r_proto" in
-       '') d_getlogin_r=undef ; echo "Disabling getlogin_r, cannot find prototype." ;;
-       * ) getlogin_r_proto="REENTRANT_PROTO_$getlogin_r_proto" ; echo "$try" ;;
+       '')     d_getlogin_r=undef
+               echo "Disabling getlogin_r, cannot determine prototype." ;;
+       * )     case "$getlogin_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getlogin_r_proto="REENTRANT_PROTO_$getlogin_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getnetbyaddr_r.U b/U/threads/d_getnetbyaddr_r.U
index 2c0b716..8249a5c 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_unistd
+?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,25 +26,35 @@ set getnetbyaddr_r d_getnetbyaddr_r
 eval $inlibc
 case "$d_getnetbyaddr_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getnetbyaddr_r(unsigned long, int, struct netent*, char*, size_t, struct netent**, int*);'
+       ./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_UISBWRE ;;
        esac
        case "$getnetbyaddr_r_proto" in
-       '')     try='extern int getnetbyaddr_r(long, int, struct netent*, char*, int);'
-               ./protochk "$try" $hdrs && getnetbyaddr_r_proto=I_LISBI;
-       ;;
+       '') try='int getnetbyaddr_r(long, int, struct netent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_LISBI ;;
        esac
        case "$getnetbyaddr_r_proto" in
-       '')     try='extern int getnetbyaddr_r(int, int, struct netent*, struct netent_data*);'
-               ./protochk "$try" $hdrs && getnetbyaddr_r_proto=I_IISD;
-       ;;
+       '') try='struct netent* getnetbyaddr_r(long, int, struct netent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=S_LISBI ;;
+       esac
+       case "$getnetbyaddr_r_proto" in
+       '') try='int getnetbyaddr_r(long, int, struct netent*, struct netent_data*);'
+       ./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_LISD ;;
+       esac
+       case "$getnetbyaddr_r_proto" in
+       '') try='int getnetbyaddr_r(int, int, struct netent*, struct netent_data*);'
+       ./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_IISD ;;
        esac
        case "$getnetbyaddr_r_proto" in
-       '') d_getnetbyaddr_r=undef ; echo "Disabling getnetbyaddr_r, cannot find prototype." ;;
-       * ) getnetbyaddr_r_proto="REENTRANT_PROTO_$getnetbyaddr_r_proto" ; echo "$try" ;;
+       '')     d_getnetbyaddr_r=undef
+               echo "Disabling getnetbyaddr_r, cannot determine prototype." ;;
+       * )     case "$getnetbyaddr_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getnetbyaddr_r_proto="REENTRANT_PROTO_$getnetbyaddr_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getnetbyname_r.U b/U/threads/d_getnetbyname_r.U
index 16f4fc3..43dc2df 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_unistd
+?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,25 +26,31 @@ set getnetbyname_r d_getnetbyname_r
 eval $inlibc
 case "$d_getnetbyname_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getnetbyname_r(const char*, struct netent*, char*, size_t, struct netent**, int*);'
+       ./protochk "extern $try" $hdrs && getnetbyname_r_proto=I_CSBWRE ;;
        esac
        case "$getnetbyname_r_proto" in
-       '')     try='extern int getnetbyname_r(const char*, struct netent*, char*, int);'
-               ./protochk "$try" $hdrs && getnetbyname_r_proto=I_CSBI;
-       ;;
+       '') try='int getnetbyname_r(const char*, struct netent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getnetbyname_r_proto=I_CSBI ;;
        esac
        case "$getnetbyname_r_proto" in
-       '')     try='extern int getnetbyname_r(const char*, struct netent*, struct netent_data*);'
-               ./protochk "$try" $hdrs && getnetbyname_r_proto=I_CSD;
-       ;;
+       '') try='struct netent* getnetbyname_r(const char*, struct netent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getnetbyname_r_proto=S_CSBI ;;
+       esac
+       case "$getnetbyname_r_proto" in
+       '') try='int getnetbyname_r(const char*, struct netent*, struct netent_data*);'
+       ./protochk "extern $try" $hdrs && getnetbyname_r_proto=I_CSD ;;
        esac
        case "$getnetbyname_r_proto" in
-       '') d_getnetbyname_r=undef ; echo "Disabling getnetbyname_r, cannot find prototype." ;;
-       * ) getnetbyname_r_proto="REENTRANT_PROTO_$getnetbyname_r_proto" ; echo "$try" ;;
+       '')     d_getnetbyname_r=undef
+               echo "Disabling getnetbyname_r, cannot determine prototype." ;;
+       * )     case "$getnetbyname_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getnetbyname_r_proto="REENTRANT_PROTO_$getnetbyname_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getnetent_r.U b/U/threads/d_getnetent_r.U
index 34b3e1d..ec62136 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_unistd
+?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,30 +26,39 @@ set getnetent_r d_getnetent_r
 eval $inlibc
 case "$d_getnetent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getnetent_r(struct netent*, char*, size_t, struct netent**, int*);'
+       ./protochk "extern $try" $hdrs && getnetent_r_proto=I_SBWRE ;;
        esac
        case "$getnetent_r_proto" in
-       '')     try='extern int getnetent_r(struct netent*, char*, int, int*);'
-               ./protochk "$try" $hdrs && getnetent_r_proto=I_SBIE;
-       ;;
+       '') try='int getnetent_r(struct netent*, char*, int, int*);'
+       ./protochk "extern $try" $hdrs && getnetent_r_proto=I_SBIE ;;
        esac
        case "$getnetent_r_proto" in
-       '')     try='extern int getnetent_r(struct netent*, char*, int);'
-               ./protochk "$try" $hdrs && getnetent_r_proto=I_SBI;
-       ;;
+       '') try='struct netent* getnetent_r(struct netent*, char*, int, int*);'
+       ./protochk "extern $try" $hdrs && getnetent_r_proto=S_SBIE ;;
        esac
        case "$getnetent_r_proto" in
-       '')     try='extern int getnetent_r(struct netent*, struct netent_data*);'
-               ./protochk "$try" $hdrs && getnetent_r_proto=I_SD;
-       ;;
+       '') try='struct netent* getnetent_r(struct netent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getnetent_r_proto=S_SBI ;;
+       esac
+       case "$getnetent_r_proto" in
+       '') try='int getnetent_r(struct netent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getnetent_r_proto=I_SBI ;;
+       esac
+       case "$getnetent_r_proto" in
+       '') try='int getnetent_r(struct netent*, struct netent_data*);'
+       ./protochk "extern $try" $hdrs && getnetent_r_proto=I_SD ;;
        esac
        case "$getnetent_r_proto" in
-       '') d_getnetent_r=undef ; echo "Disabling getnetent_r, cannot find prototype." ;;
-       * ) getnetent_r_proto="REENTRANT_PROTO_$getnetent_r_proto" ; echo "$try" ;;
+       '')     d_getnetent_r=undef
+               echo "Disabling getnetent_r, cannot determine prototype." ;;
+       * )     case "$getnetent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getnetent_r_proto="REENTRANT_PROTO_$getnetent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getprotobyname_r.U b/U/threads/d_getprotobyname_r.U
index b17b355..44d1ad2 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_unistd
+?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,25 +26,27 @@ set getprotobyname_r d_getprotobyname_r
 eval $inlibc
 case "$d_getprotobyname_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getprotobyname_r(const char*, struct protoent*, char*, size_t, struct protoent**);'
+       ./protochk "extern $try" $hdrs && getprotobyname_r_proto=I_CSBWR ;;
        esac
        case "$getprotobyname_r_proto" in
-       '')     try='extern struct protoent* getprotobyname_r(const char*, struct protoent*, char*, int);'
-               ./protochk "$try" $hdrs && getprotobyname_r_proto=S_CSBI;
-       ;;
+       '') try='struct protoent* getprotobyname_r(const char*, struct protoent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getprotobyname_r_proto=S_CSBI ;;
        esac
        case "$getprotobyname_r_proto" in
-       '')     try='extern int getprotobyname_r(const char*, struct protoent*, struct protoent_data*);'
-               ./protochk "$try" $hdrs && getprotobyname_r_proto=I_CSD;
-       ;;
+       '') try='int getprotobyname_r(const char*, struct protoent*, struct protoent_data*);'
+       ./protochk "extern $try" $hdrs && getprotobyname_r_proto=I_CSD ;;
        esac
        case "$getprotobyname_r_proto" in
-       '') d_getprotobyname_r=undef ; echo "Disabling getprotobyname_r, cannot find prototype." ;;
-       * ) getprotobyname_r_proto="REENTRANT_PROTO_$getprotobyname_r_proto" ; echo "$try" ;;
+       '')     d_getprotobyname_r=undef
+               echo "Disabling getprotobyname_r, cannot determine prototype." ;;
+       * )     case "$getprotobyname_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getprotobyname_r_proto="REENTRANT_PROTO_$getprotobyname_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getprotobynumber_r.U b/U/threads/d_getprotobynumber_r.U
index 437eb2a..8fb484d 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_unistd
+?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,25 +26,27 @@ set getprotobynumber_r d_getprotobynumber_r
 eval $inlibc
 case "$d_getprotobynumber_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getprotobynumber_r(int, struct protoent*, char*, size_t, struct protoent**);'
+       ./protochk "extern $try" $hdrs && getprotobynumber_r_proto=I_ISBWR ;;
        esac
        case "$getprotobynumber_r_proto" in
-       '')     try='extern struct protoent* getprotobynumber_r(int, struct protoent*, char*, int);'
-               ./protochk "$try" $hdrs && getprotobynumber_r_proto=S_ISBI;
-       ;;
+       '') try='struct protoent* getprotobynumber_r(int, struct protoent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getprotobynumber_r_proto=S_ISBI ;;
        esac
        case "$getprotobynumber_r_proto" in
-       '')     try='extern int getprotobynumber_r(int, struct protoent*, struct protoent_data*);'
-               ./protochk "$try" $hdrs && getprotobynumber_r_proto=I_ISD;
-       ;;
+       '') try='int getprotobynumber_r(int, struct protoent*, struct protoent_data*);'
+       ./protochk "extern $try" $hdrs && getprotobynumber_r_proto=I_ISD ;;
        esac
        case "$getprotobynumber_r_proto" in
-       '') d_getprotobynumber_r=undef ; echo "Disabling getprotobynumber_r, cannot find prototype." ;;
-       * ) getprotobynumber_r_proto="REENTRANT_PROTO_$getprotobynumber_r_proto" ; echo "$try" ;;
+       '')     d_getprotobynumber_r=undef
+               echo "Disabling getprotobynumber_r, cannot determine prototype." ;;
+       * )     case "$getprotobynumber_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getprotobynumber_r_proto="REENTRANT_PROTO_$getprotobynumber_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getprotoent_r.U b/U/threads/d_getprotoent_r.U
index 6d780d3..4465de9 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_unistd
+?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,25 +26,31 @@ set getprotoent_r d_getprotoent_r
 eval $inlibc
 case "$d_getprotoent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getprotoent_r(struct protoent*, char*, size_t, struct protoent**);'
+       ./protochk "extern $try" $hdrs && getprotoent_r_proto=I_SBWR ;;
        esac
        case "$getprotoent_r_proto" in
-       '')     try='extern int getprotoent_r(struct protoent*, char*, int);'
-               ./protochk "$try" $hdrs && getprotoent_r_proto=I_SBI;
-       ;;
+       '') try='int getprotoent_r(struct protoent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getprotoent_r_proto=I_SBI ;;
        esac
        case "$getprotoent_r_proto" in
-       '')     try='extern int getprotoent_r(struct protoent*, struct protoent_data*);'
-               ./protochk "$try" $hdrs && getprotoent_r_proto=I_SD;
-       ;;
+       '') try='struct protoent* getprotoent_r(struct protoent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getprotoent_r_proto=S_SBI ;;
+       esac
+       case "$getprotoent_r_proto" in
+       '') try='int getprotoent_r(struct protoent*, struct protoent_data*);'
+       ./protochk "extern $try" $hdrs && getprotoent_r_proto=I_SD ;;
        esac
        case "$getprotoent_r_proto" in
-       '') d_getprotoent_r=undef ; echo "Disabling getprotoent_r, cannot find prototype." ;;
-       * ) getprotoent_r_proto="REENTRANT_PROTO_$getprotoent_r_proto" ; echo "$try" ;;
+       '')     d_getprotoent_r=undef
+               echo "Disabling getprotoent_r, cannot determine prototype." ;;
+       * )     case "$getprotoent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getprotoent_r_proto="REENTRANT_PROTO_$getprotoent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getpwent_r.U b/U/threads/d_getpwent_r.U
index 8a96af7..da49c36 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_unistd
+?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,30 +26,35 @@ set getpwent_r d_getpwent_r
 eval $inlibc
 case "$d_getpwent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getpwent_r(struct passwd*, char*, size_t, struct passwd**);'
+       ./protochk "extern $try" $hdrs && getpwent_r_proto=I_SBWR ;;
        esac
        case "$getpwent_r_proto" in
-       '')     try='extern int getpwent_r(struct passwd*, char*, int, struct passwd**);'
-               ./protochk "$try" $hdrs && getpwent_r_proto=I_SBIR;
-       ;;
+       '') try='int getpwent_r(struct passwd*, char*, int, struct passwd**);'
+       ./protochk "extern $try" $hdrs && getpwent_r_proto=I_SBIR ;;
        esac
        case "$getpwent_r_proto" in
-       '')     try='extern int getpwent_r(struct passwd*, char*, int);'
-               ./protochk "$try" $hdrs && getpwent_r_proto=I_SBI;
-       ;;
+       '') try='struct passwd* getpwent_r(struct passwd*, char*, int);'
+       ./protochk "extern $try" $hdrs && getpwent_r_proto=S_SBI ;;
        esac
        case "$getpwent_r_proto" in
-       '')     try='extern int getpwent_r(struct passwd*, char*, int, FILE**);'
-               ./protochk "$try" $hdrs && getpwent_r_proto=I_SBIH;
-       ;;
+       '') try='int getpwent_r(struct passwd*, char*, int);'
+       ./protochk "extern $try" $hdrs && getpwent_r_proto=I_SBI ;;
+       esac
+       case "$getpwent_r_proto" in
+       '') try='int getpwent_r(struct passwd*, char*, int, FILE**);'
+       ./protochk "extern $try" $hdrs && getpwent_r_proto=I_SBIH ;;
        esac
        case "$getpwent_r_proto" in
-       '') d_getpwent_r=undef ; echo "Disabling getpwent_r, cannot find prototype." ;;
-       * ) getpwent_r_proto="REENTRANT_PROTO_$getpwent_r_proto" ; echo "$try" ;;
+       '')     d_getpwent_r=undef
+               echo "Disabling getpwent_r, cannot determine prototype." ;;
+       * )     case "$getpwent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getpwent_r_proto="REENTRANT_PROTO_$getpwent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getpwnam_r.U b/U/threads/d_getpwnam_r.U
index 7a1ceca..0e8abcb 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_unistd
+?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,30 +26,27 @@ set getpwnam_r d_getpwnam_r
 eval $inlibc
 case "$d_getpwnam_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
-       esac
-       case "$getpwnam_r_proto" in
-       '')     try='extern int getpwnam_r(const char*, struct passwd*, char*, int, struct passwd**);'
-               ./protochk "$try" $hdrs && getpwnam_r_proto=I_CSBIR;
-       ;;
+       '') try='int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);'
+       ./protochk "extern $try" $hdrs && getpwnam_r_proto=I_CSBWR ;;
        esac
        case "$getpwnam_r_proto" in
-       '')     try='extern int getpwnam_r(const char*, struct passwd*, char*, int);'
-               ./protochk "$try" $hdrs && getpwnam_r_proto=I_CSBI;
-       ;;
+       '') try='struct passwd* getpwnam_r(const char*, struct passwd*, char*, int);'
+       ./protochk "extern $try" $hdrs && getpwnam_r_proto=S_CSBI ;;
        esac
        case "$getpwnam_r_proto" in
-       '')     try='extern struct passwd* getpwnam_r(const char*, struct passwd*, char*, int);'
-               ./protochk "$try" $hdrs && getpwnam_r_proto=S_CSBI;
-       ;;
+       '') try='int getpwnam_r(const char*, struct passwd*, char*, int);'
+       ./protochk "extern $try" $hdrs && getpwnam_r_proto=I_CSBI ;;
        esac
        case "$getpwnam_r_proto" in
-       '') d_getpwnam_r=undef ; echo "Disabling getpwnam_r, cannot find prototype." ;;
-       * ) getpwnam_r_proto="REENTRANT_PROTO_$getpwnam_r_proto" ; echo "$try" ;;
+       '')     d_getpwnam_r=undef
+               echo "Disabling getpwnam_r, cannot determine prototype." ;;
+       * )     case "$getpwnam_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getpwnam_r_proto="REENTRANT_PROTO_$getpwnam_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getpwuid_r.U b/U/threads/d_getpwuid_r.U
index 059f2bc..ff6c833 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_unistd
+?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,30 +26,31 @@ set getpwuid_r d_getpwuid_r
 eval $inlibc
 case "$d_getpwuid_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);'
+       ./protochk "extern $try" $hdrs && getpwuid_r_proto=I_TSBWR ;;
        esac
        case "$getpwuid_r_proto" in
-       '')     try='extern int getpwuid_r(uid_t, struct passwd*, char*, int, struct passwd**);'
-               ./protochk "$try" $hdrs && getpwuid_r_proto=I_TSBIR;
-       ;;
+       '') try='int getpwuid_r(uid_t, struct passwd*, char*, int, struct passwd**);'
+       ./protochk "extern $try" $hdrs && getpwuid_r_proto=I_TSBIR ;;
        esac
        case "$getpwuid_r_proto" in
-       '')     try='extern int getpwuid_r(uid_t, struct passwd*, char*, int);'
-               ./protochk "$try" $hdrs && getpwuid_r_proto=I_TSBI;
-       ;;
+       '') try='int getpwuid_r(uid_t, struct passwd*, char*, int);'
+       ./protochk "extern $try" $hdrs && getpwuid_r_proto=I_TSBI ;;
        esac
        case "$getpwuid_r_proto" in
-       '')     try='extern struct passwd* getpwuid_r(uid_t, struct passwd*, char*, int);'
-               ./protochk "$try" $hdrs && getpwuid_r_proto=S_TSBI;
-       ;;
+       '') try='struct passwd* getpwuid_r(uid_t, struct passwd*, char*, int);'
+       ./protochk "extern $try" $hdrs && getpwuid_r_proto=S_TSBI ;;
        esac
        case "$getpwuid_r_proto" in
-       '') d_getpwuid_r=undef ; echo "Disabling getpwuid_r, cannot find prototype." ;;
-       * ) getpwuid_r_proto="REENTRANT_PROTO_$getpwuid_r_proto" ; echo "$try" ;;
+       '')     d_getpwuid_r=undef
+               echo "Disabling getpwuid_r, cannot determine prototype." ;;
+       * )     case "$getpwuid_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getpwuid_r_proto="REENTRANT_PROTO_$getpwuid_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getservbyname_r.U b/U/threads/d_getservbyname_r.U
index 774a888..bdaa7cf 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_unistd
+?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,25 +26,27 @@ set getservbyname_r d_getservbyname_r
 eval $inlibc
 case "$d_getservbyname_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getservbyname_r(const char*, const char*, struct servent*, char*, size_t, struct servent**);'
+       ./protochk "extern $try" $hdrs && getservbyname_r_proto=I_CCSBWR ;;
        esac
        case "$getservbyname_r_proto" in
-       '')     try='extern struct servent* getservbyname_r(const char*, const char*, struct servent*, char*, int);'
-               ./protochk "$try" $hdrs && getservbyname_r_proto=S_CCSBI;
-       ;;
+       '') try='struct servent* getservbyname_r(const char*, const char*, struct servent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getservbyname_r_proto=S_CCSBI ;;
        esac
        case "$getservbyname_r_proto" in
-       '')     try='extern int getservbyname_r(const char*, const char*, struct servent*, struct servent_data*);'
-               ./protochk "$try" $hdrs && getservbyname_r_proto=I_CCSD;
-       ;;
+       '') try='int getservbyname_r(const char*, const char*, struct servent*, struct servent_data*);'
+       ./protochk "extern $try" $hdrs && getservbyname_r_proto=I_CCSD ;;
        esac
        case "$getservbyname_r_proto" in
-       '') d_getservbyname_r=undef ; echo "Disabling getservbyname_r, cannot find prototype." ;;
-       * ) getservbyname_r_proto="REENTRANT_PROTO_$getservbyname_r_proto" ; echo "$try" ;;
+       '')     d_getservbyname_r=undef
+               echo "Disabling getservbyname_r, cannot determine prototype." ;;
+       * )     case "$getservbyname_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getservbyname_r_proto="REENTRANT_PROTO_$getservbyname_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getservbyport_r.U b/U/threads/d_getservbyport_r.U
index 52941ac..4133e4d 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_unistd
+?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,25 +26,27 @@ set getservbyport_r d_getservbyport_r
 eval $inlibc
 case "$d_getservbyport_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getservbyport_r(int, const char*, struct servent*, char*, size_t, struct servent**);'
+       ./protochk "extern $try" $hdrs && getservbyport_r_proto=I_ICSBWR ;;
        esac
        case "$getservbyport_r_proto" in
-       '')     try='extern struct servent* getservbyport_r(int, const char*, struct servent*, char*, int);'
-               ./protochk "$try" $hdrs && getservbyport_r_proto=S_ICSBI;
-       ;;
+       '') try='struct servent* getservbyport_r(int, const char*, struct servent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getservbyport_r_proto=S_ICSBI ;;
        esac
        case "$getservbyport_r_proto" in
-       '')     try='extern int getservbyport_r(int, const char*, struct servent*, struct servent_data*);'
-               ./protochk "$try" $hdrs && getservbyport_r_proto=I_ICSD;
-       ;;
+       '') try='int getservbyport_r(int, const char*, struct servent*, struct servent_data*);'
+       ./protochk "extern $try" $hdrs && getservbyport_r_proto=I_ICSD ;;
        esac
        case "$getservbyport_r_proto" in
-       '') d_getservbyport_r=undef ; echo "Disabling getservbyport_r, cannot find prototype." ;;
-       * ) getservbyport_r_proto="REENTRANT_PROTO_$getservbyport_r_proto" ; echo "$try" ;;
+       '')     d_getservbyport_r=undef
+               echo "Disabling getservbyport_r, cannot determine prototype." ;;
+       * )     case "$getservbyport_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getservbyport_r_proto="REENTRANT_PROTO_$getservbyport_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getservent_r.U b/U/threads/d_getservent_r.U
index d80694f..a8fd798 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_unistd
+?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,25 +26,31 @@ set getservent_r d_getservent_r
 eval $inlibc
 case "$d_getservent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getservent_r(struct servent*, char*, size_t, struct servent**);'
+       ./protochk "extern $try" $hdrs && getservent_r_proto=I_SBWR ;;
        esac
        case "$getservent_r_proto" in
-       '')     try='extern int getservent_r(struct servent*, char*, int);'
-               ./protochk "$try" $hdrs && getservent_r_proto=I_SBI;
-       ;;
+       '') try='int getservent_r(struct servent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getservent_r_proto=I_SBI ;;
        esac
        case "$getservent_r_proto" in
-       '')     try='extern int getservent_r(struct servent*, struct servent_data*);'
-               ./protochk "$try" $hdrs && getservent_r_proto=I_SD;
-       ;;
+       '') try='struct servent* getservent_r(struct servent*, char*, int);'
+       ./protochk "extern $try" $hdrs && getservent_r_proto=S_SBI ;;
+       esac
+       case "$getservent_r_proto" in
+       '') try='int getservent_r(struct servent*, struct servent_data*);'
+       ./protochk "extern $try" $hdrs && getservent_r_proto=I_SD ;;
        esac
        case "$getservent_r_proto" in
-       '') d_getservent_r=undef ; echo "Disabling getservent_r, cannot find prototype." ;;
-       * ) getservent_r_proto="REENTRANT_PROTO_$getservent_r_proto" ; echo "$try" ;;
+       '')     d_getservent_r=undef
+               echo "Disabling getservent_r, cannot determine prototype." ;;
+       * )     case "$getservent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getservent_r_proto="REENTRANT_PROTO_$getservent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_getspnam_r.U b/U/threads/d_getspnam_r.U
index db39525..c99a490 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_unistd
+?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,20 +26,23 @@ set getspnam_r d_getspnam_r
 eval $inlibc
 case "$d_getspnam_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int getspnam_r(const char*, struct spwd*, char*, size_t, struct spwd**);'
+       ./protochk "extern $try" $hdrs && getspnam_r_proto=I_CSBWR ;;
        esac
        case "$getspnam_r_proto" in
-       '')     try='extern struct spwd* getspnam_r(const char*, struct spwd*, char*, int);'
-               ./protochk "$try" $hdrs && getspnam_r_proto=S_CSBI;
-       ;;
+       '') try='struct spwd* getspnam_r(const char*, struct spwd*, char*, int);'
+       ./protochk "extern $try" $hdrs && getspnam_r_proto=S_CSBI ;;
        esac
        case "$getspnam_r_proto" in
-       '') d_getspnam_r=undef ; echo "Disabling getspnam_r, cannot find prototype." ;;
-       * ) getspnam_r_proto="REENTRANT_PROTO_$getspnam_r_proto" ; echo "$try" ;;
+       '')     d_getspnam_r=undef
+               echo "Disabling getspnam_r, cannot determine prototype." ;;
+       * )     case "$getspnam_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) getspnam_r_proto="REENTRANT_PROTO_$getspnam_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_gmtime_r.U b/U/threads/d_gmtime_r.U
index 447b0c2..bbab835 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_unistd
+?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,20 +26,23 @@ set gmtime_r d_gmtime_r
 eval $inlibc
 case "$d_gmtime_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='struct tm* gmtime_r(const time_t*, struct tm*);'
+       ./protochk "extern $try" $hdrs && gmtime_r_proto=S_TS ;;
        esac
        case "$gmtime_r_proto" in
-       '')     try='extern int gmtime_r(const time_t*, struct tm*);'
-               ./protochk "$try" $hdrs && gmtime_r_proto=I_TS;
-       ;;
+       '') try='int gmtime_r(const time_t*, struct tm*);'
+       ./protochk "extern $try" $hdrs && gmtime_r_proto=I_TS ;;
        esac
        case "$gmtime_r_proto" in
-       '') d_gmtime_r=undef ; echo "Disabling gmtime_r, cannot find prototype." ;;
-       * ) gmtime_r_proto="REENTRANT_PROTO_$gmtime_r_proto" ; echo "$try" ;;
+       '')     d_gmtime_r=undef
+               echo "Disabling gmtime_r, cannot determine prototype." ;;
+       * )     case "$gmtime_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) gmtime_r_proto="REENTRANT_PROTO_$gmtime_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_localtime_r.U b/U/threads/d_localtime_r.U
index 8f6d4b2..576afec 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_unistd
+?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,20 +26,23 @@ set localtime_r d_localtime_r
 eval $inlibc
 case "$d_localtime_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='struct tm* localtime_r(const time_t*, struct tm*);'
+       ./protochk "extern $try" $hdrs && localtime_r_proto=S_TS ;;
        esac
        case "$localtime_r_proto" in
-       '')     try='extern int localtime_r(const time_t*, struct tm*);'
-               ./protochk "$try" $hdrs && localtime_r_proto=I_TS;
-       ;;
+       '') try='int localtime_r(const time_t*, struct tm*);'
+       ./protochk "extern $try" $hdrs && localtime_r_proto=I_TS ;;
        esac
        case "$localtime_r_proto" in
-       '') d_localtime_r=undef ; echo "Disabling localtime_r, cannot find prototype." ;;
-       * ) localtime_r_proto="REENTRANT_PROTO_$localtime_r_proto" ; echo "$try" ;;
+       '')     d_localtime_r=undef
+               echo "Disabling localtime_r, cannot determine prototype." ;;
+       * )     case "$localtime_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) localtime_r_proto="REENTRANT_PROTO_$localtime_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_random_r.U b/U/threads/d_random_r.U
index 8174713..d3e74bd 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_unistd
+?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,15 +26,19 @@ set random_r d_random_r
 eval $inlibc
 case "$d_random_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int random_r(int*, struct random_data*);'
+       ./protochk "extern $try" $hdrs && random_r_proto=I_TS ;;
        esac
        case "$random_r_proto" in
-       '') d_random_r=undef ; echo "Disabling random_r, cannot find prototype." ;;
-       * ) random_r_proto="REENTRANT_PROTO_$random_r_proto" ; echo "$try" ;;
+       '')     d_random_r=undef
+               echo "Disabling random_r, cannot determine prototype." ;;
+       * )     case "$random_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) random_r_proto="REENTRANT_PROTO_$random_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_readdir64_r.U b/U/threads/d_readdir64_r.U
index 52a1953..0ec7be0 100644 (file)
--- a/U/threads/d_readdir64_r.U
+++ b/U/threads/d_readdir64_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_readdir64_r readdir64_r_proto: Inlibc Protochk i_systypes i_unistd
+?MAKE:d_readdir64_r readdir64_r_proto: Inlibc Protochk i_systypes i_dirent
 ?MAKE: -pick add $@ %<
 ?S:d_readdir64_r:
 ?S:    This variable conditionally defines the HAS_READDIR64_R symbol,
@@ -26,20 +26,23 @@ set readdir64_r d_readdir64_r
 eval $inlibc
 case "$d_readdir64_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int readdir64_r(DIR*, struct dirent64*, struct dirent64**);'
+       ./protochk "extern $try" $hdrs && readdir64_r_proto=I_TSR ;;
        esac
        case "$readdir64_r_proto" in
-       '')     try='extern int readdir64_r(DIR*, struct dirent64*);'
-               ./protochk "$try" $hdrs && readdir64_r_proto=I_TS;
-       ;;
+       '') try='int readdir64_r(DIR*, struct dirent64*);'
+       ./protochk "extern $try" $hdrs && readdir64_r_proto=I_TS ;;
        esac
        case "$readdir64_r_proto" in
-       '') d_readdir64_r=undef ; echo "Disabling readdir64_r, cannot find prototype." ;;
-       * ) readdir64_r_proto="REENTRANT_PROTO_$readdir64_r_proto" ; echo "$try" ;;
+       '')     d_readdir64_r=undef
+               echo "Disabling readdir64_r, cannot determine prototype." ;;
+       * )     case "$readdir64_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) readdir64_r_proto="REENTRANT_PROTO_$readdir64_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_readdir_r.U b/U/threads/d_readdir_r.U
index c532095..ce5fdb7 100644 (file)
--- a/U/threads/d_readdir_r.U
+++ b/U/threads/d_readdir_r.U
@@ -1,4 +1,4 @@
-?MAKE:d_readdir_r readdir_r_proto: Inlibc Protochk i_systypes i_unistd
+?MAKE:d_readdir_r readdir_r_proto: Inlibc Protochk i_systypes i_dirent
 ?MAKE: -pick add $@ %<
 ?S:d_readdir_r:
 ?S:    This variable conditionally defines the HAS_READDIR_R symbol,
@@ -26,20 +26,23 @@ set readdir_r d_readdir_r
 eval $inlibc
 case "$d_readdir_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int readdir_r(DIR*, struct dirent*, struct dirent**);'
+       ./protochk "extern $try" $hdrs && readdir_r_proto=I_TSR ;;
        esac
        case "$readdir_r_proto" in
-       '')     try='extern int readdir_r(DIR*, struct dirent*);'
-               ./protochk "$try" $hdrs && readdir_r_proto=I_TS;
-       ;;
+       '') try='int readdir_r(DIR*, struct dirent*);'
+       ./protochk "extern $try" $hdrs && readdir_r_proto=I_TS ;;
        esac
        case "$readdir_r_proto" in
-       '') d_readdir_r=undef ; echo "Disabling readdir_r, cannot find prototype." ;;
-       * ) readdir_r_proto="REENTRANT_PROTO_$readdir_r_proto" ; echo "$try" ;;
+       '')     d_readdir_r=undef
+               echo "Disabling readdir_r, cannot determine prototype." ;;
+       * )     case "$readdir_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) readdir_r_proto="REENTRANT_PROTO_$readdir_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_setgrent_r.U b/U/threads/d_setgrent_r.U
index c00067a..ad75cbc 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_unistd
+?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,20 +26,23 @@ set setgrent_r d_setgrent_r
 eval $inlibc
 case "$d_setgrent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
        case "$setgrent_r_proto" in
-       '')     try='extern int setgrent_r(FILE**);'
-               ./protochk "$try" $hdrs && setgrent_r_proto=I_H;
-       ;;
+       '') try='int setgrent_r(FILE**);'
+       ./protochk "extern $try" $hdrs && setgrent_r_proto=I_H ;;
        esac
        case "$setgrent_r_proto" in
-       '')     try='extern void setgrent_r(FILE**);'
-               ./protochk "$try" $hdrs && setgrent_r_proto=V_H;
-       ;;
+       '') try='void setgrent_r(FILE**);'
+       ./protochk "extern $try" $hdrs && setgrent_r_proto=V_H ;;
        esac
        case "$setgrent_r_proto" in
-       '') d_setgrent_r=undef ; echo "Disabling setgrent_r, cannot find prototype." ;;
-       * ) setgrent_r_proto="REENTRANT_PROTO_$setgrent_r_proto" ; echo "$try" ;;
+       '')     d_setgrent_r=undef
+               echo "Disabling setgrent_r, cannot determine prototype." ;;
+       * )     case "$setgrent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) setgrent_r_proto="REENTRANT_PROTO_$setgrent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_sethostent_r.U b/U/threads/d_sethostent_r.U
index fb70019..2dd3833 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_unistd
+?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,15 +26,19 @@ set sethostent_r d_sethostent_r
 eval $inlibc
 case "$d_sethostent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int sethostent_r(int, struct hostent_data*);'
+       ./protochk "extern $try" $hdrs && sethostent_r_proto=I_IS ;;
        esac
        case "$sethostent_r_proto" in
-       '') d_sethostent_r=undef ; echo "Disabling sethostent_r, cannot find prototype." ;;
-       * ) sethostent_r_proto="REENTRANT_PROTO_$sethostent_r_proto" ; echo "$try" ;;
+       '')     d_sethostent_r=undef
+               echo "Disabling sethostent_r, cannot determine prototype." ;;
+       * )     case "$sethostent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) sethostent_r_proto="REENTRANT_PROTO_$sethostent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_setlocale_r.U b/U/threads/d_setlocale_r.U
index 4e43824..1f5d711 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_unistd
+?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,15 +26,19 @@ set setlocale_r d_setlocale_r
 eval $inlibc
 case "$d_setlocale_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int setlocale_r(int, const char*, char*, int);'
+       ./protochk "extern $try" $hdrs && setlocale_r_proto=I_ICBI ;;
        esac
        case "$setlocale_r_proto" in
-       '') d_setlocale_r=undef ; echo "Disabling setlocale_r, cannot find prototype." ;;
-       * ) setlocale_r_proto="REENTRANT_PROTO_$setlocale_r_proto" ; echo "$try" ;;
+       '')     d_setlocale_r=undef
+               echo "Disabling setlocale_r, cannot determine prototype." ;;
+       * )     case "$setlocale_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) setlocale_r_proto="REENTRANT_PROTO_$setlocale_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_setnetent_r.U b/U/threads/d_setnetent_r.U
index 7993281..420b575 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_unistd
+?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,15 +26,19 @@ set setnetent_r d_setnetent_r
 eval $inlibc
 case "$d_setnetent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int setnetent_r(int, struct netent_data*);'
+       ./protochk "extern $try" $hdrs && setnetent_r_proto=I_IS ;;
        esac
        case "$setnetent_r_proto" in
-       '') d_setnetent_r=undef ; echo "Disabling setnetent_r, cannot find prototype." ;;
-       * ) setnetent_r_proto="REENTRANT_PROTO_$setnetent_r_proto" ; echo "$try" ;;
+       '')     d_setnetent_r=undef
+               echo "Disabling setnetent_r, cannot determine prototype." ;;
+       * )     case "$setnetent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) setnetent_r_proto="REENTRANT_PROTO_$setnetent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_setprotoent_r.U b/U/threads/d_setprotoent_r.U
index 72b49e1..1103ed2 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_unistd
+?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,15 +26,19 @@ set setprotoent_r d_setprotoent_r
 eval $inlibc
 case "$d_setprotoent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int setprotoent_r(int, struct protoent_data*);'
+       ./protochk "extern $try" $hdrs && setprotoent_r_proto=I_IS ;;
        esac
        case "$setprotoent_r_proto" in
-       '') d_setprotoent_r=undef ; echo "Disabling setprotoent_r, cannot find prototype." ;;
-       * ) setprotoent_r_proto="REENTRANT_PROTO_$setprotoent_r_proto" ; echo "$try" ;;
+       '')     d_setprotoent_r=undef
+               echo "Disabling setprotoent_r, cannot determine prototype." ;;
+       * )     case "$setprotoent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) setprotoent_r_proto="REENTRANT_PROTO_$setprotoent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_setpwent_r.U b/U/threads/d_setpwent_r.U
index 99f4930..7cb2eac 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_unistd
+?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,20 +26,23 @@ set setpwent_r d_setpwent_r
 eval $inlibc
 case "$d_setpwent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
        case "$setpwent_r_proto" in
-       '')     try='extern int setpwent_r(FILE**);'
-               ./protochk "$try" $hdrs && setpwent_r_proto=I_H;
-       ;;
+       '') try='int setpwent_r(FILE**);'
+       ./protochk "extern $try" $hdrs && setpwent_r_proto=I_H ;;
        esac
        case "$setpwent_r_proto" in
-       '')     try='extern void setpwent_r(FILE**);'
-               ./protochk "$try" $hdrs && setpwent_r_proto=V_H;
-       ;;
+       '') try='void setpwent_r(FILE**);'
+       ./protochk "extern $try" $hdrs && setpwent_r_proto=V_H ;;
        esac
        case "$setpwent_r_proto" in
-       '') d_setpwent_r=undef ; echo "Disabling setpwent_r, cannot find prototype." ;;
-       * ) setpwent_r_proto="REENTRANT_PROTO_$setpwent_r_proto" ; echo "$try" ;;
+       '')     d_setpwent_r=undef
+               echo "Disabling setpwent_r, cannot determine prototype." ;;
+       * )     case "$setpwent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) setpwent_r_proto="REENTRANT_PROTO_$setpwent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_setservent_r.U b/U/threads/d_setservent_r.U
index b01e467..f529256 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_unistd
+?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,15 +26,19 @@ set setservent_r d_setservent_r
 eval $inlibc
 case "$d_setservent_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int setservent_r(int, struct servent_data*);'
+       ./protochk "extern $try" $hdrs && setservent_r_proto=I_IS ;;
        esac
        case "$setservent_r_proto" in
-       '') d_setservent_r=undef ; echo "Disabling setservent_r, cannot find prototype." ;;
-       * ) setservent_r_proto="REENTRANT_PROTO_$setservent_r_proto" ; echo "$try" ;;
+       '')     d_setservent_r=undef
+               echo "Disabling setservent_r, cannot determine prototype." ;;
+       * )     case "$setservent_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) setservent_r_proto="REENTRANT_PROTO_$setservent_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_srand48_r.U b/U/threads/d_srand48_r.U
index 91b2e52..9f46833 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_unistd
+?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,15 +26,19 @@ set srand48_r d_srand48_r
 eval $inlibc
 case "$d_srand48_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int srand48_r(long, struct drand48_data*);'
+       ./protochk "extern $try" $hdrs && srand48_r_proto=I_LS ;;
        esac
        case "$srand48_r_proto" in
-       '') d_srand48_r=undef ; echo "Disabling srand48_r, cannot find prototype." ;;
-       * ) srand48_r_proto="REENTRANT_PROTO_$srand48_r_proto" ; echo "$try" ;;
+       '')     d_srand48_r=undef
+               echo "Disabling srand48_r, cannot determine prototype." ;;
+       * )     case "$srand48_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) srand48_r_proto="REENTRANT_PROTO_$srand48_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_srandom_r.U b/U/threads/d_srandom_r.U
index c200080..da66807 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_unistd
+?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,15 +26,19 @@ set srandom_r d_srandom_r
 eval $inlibc
 case "$d_srandom_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int srandom_r(unsigned int, struct random_data*);'
+       ./protochk "extern $try" $hdrs && srandom_r_proto=I_TS ;;
        esac
        case "$srandom_r_proto" in
-       '') d_srandom_r=undef ; echo "Disabling srandom_r, cannot find prototype." ;;
-       * ) srandom_r_proto="REENTRANT_PROTO_$srandom_r_proto" ; echo "$try" ;;
+       '')     d_srandom_r=undef
+               echo "Disabling srandom_r, cannot determine prototype." ;;
+       * )     case "$srandom_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) srandom_r_proto="REENTRANT_PROTO_$srandom_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_strerror_r.U b/U/threads/d_strerror_r.U
index f7aaac4..6701733 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_unistd
+?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,20 +26,27 @@ set strerror_r d_strerror_r
 eval $inlibc
 case "$d_strerror_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.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;
-       ;;
+       '') try='int strerror_r(int, char*, size_t);'
+       ./protochk "extern $try" $hdrs && strerror_r_proto=I_IBW ;;
        esac
        case "$strerror_r_proto" in
-       '')     try='extern char* strerror_r(int, char*, size_t);'
-               ./protochk "$try" $hdrs && strerror_r_proto=B_IBW;
-       ;;
+       '') try='int strerror_r(int, char*, int);'
+       ./protochk "extern $try" $hdrs && strerror_r_proto=I_IBI ;;
+       esac
+       case "$strerror_r_proto" in
+       '') try='char* strerror_r(int, char*, size_t);'
+       ./protochk "extern $try" $hdrs && strerror_r_proto=B_IBW ;;
        esac
        case "$strerror_r_proto" in
-       '') d_strerror_r=undef ; echo "Disabling strerror_r, cannot find prototype." ;;
-       * ) strerror_r_proto="REENTRANT_PROTO_$strerror_r_proto" ; echo "$try" ;;
+       '')     d_strerror_r=undef
+               echo "Disabling strerror_r, cannot determine prototype." ;;
+       * )     case "$strerror_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) strerror_r_proto="REENTRANT_PROTO_$strerror_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_tmpnam_r.U b/U/threads/d_tmpnam_r.U
index 9f3fc15..838d1b7 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_unistd
+?MAKE:d_tmpnam_r tmpnam_r_proto: Inlibc Protochk i_systypes 
 ?MAKE: -pick add $@ %<
 ?S:d_tmpnam_r:
 ?S:    This variable conditionally defines the HAS_TMPNAM_R symbol,
@@ -26,15 +26,19 @@ set tmpnam_r d_tmpnam_r
 eval $inlibc
 case "$d_tmpnam_r" in
 "$define")
-       hdrs="$i_systypes sys/types.h $i_unistd unistd.h"
+       hdrs="$i_systypes sys/types.h define stdio.h $i_stdio stdio.h"
        case "$tmpnam_r_proto" in
-       '')     try='extern char* tmpnam_r(char*);'
-               ./protochk "$try" $hdrs && tmpnam_r_proto=B_B;
-       ;;
+       '') try='char* tmpnam_r(char*);'
+       ./protochk "extern $try" $hdrs && tmpnam_r_proto=B_B ;;
        esac
        case "$tmpnam_r_proto" in
-       '') d_tmpnam_r=undef ; echo "Disabling tmpnam_r, cannot find prototype." ;;
-       * ) tmpnam_r_proto="REENTRANT_PROTO_$tmpnam_r_proto" ; echo "$try" ;;
+       '')     d_tmpnam_r=undef
+               echo "Disabling tmpnam_r, cannot determine prototype." ;;
+       * )     case "$tmpnam_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) tmpnam_r_proto="REENTRANT_PROTO_$tmpnam_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac

diff --git a/U/threads/d_ttyname_r.U b/U/threads/d_ttyname_r.U
index e7ce4ad..20daa0a 100644 (file)
--- a/U/threads/d_ttyname_r.U
+++ b/U/threads/d_ttyname_r.U
@@ -26,25 +26,27 @@ 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 define stdio.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;
-       ;;
+       '') try='int ttyname_r(int, char*, size_t);'
+       ./protochk "extern $try" $hdrs && ttyname_r_proto=I_IBW ;;
        esac
        case "$ttyname_r_proto" in
-       '')     try='extern int ttyname_r(int, char*, int);'
-               ./protochk "$try" $hdrs && ttyname_r_proto=I_IBI;
-       ;;
+       '') try='int ttyname_r(int, char*, int);'
+       ./protochk "extern $try" $hdrs && ttyname_r_proto=I_IBI ;;
        esac
        case "$ttyname_r_proto" in
-       '')     try='extern char* ttyname_r(int, char*, int);'
-               ./protochk "$try" $hdrs && ttyname_r_proto=B_IBI;
-       ;;
+       '') try='char* ttyname_r(int, char*, int);'
+       ./protochk "extern $try" $hdrs && ttyname_r_proto=B_IBI ;;
        esac
        case "$ttyname_r_proto" in
-       '') d_ttyname_r=undef ; echo "Disabling ttyname_r, cannot find prototype." ;;
-       * ) ttyname_r_proto="REENTRANT_PROTO_$ttyname_r_proto" ; echo "$try" ;;
+       '')     d_ttyname_r=undef
+               echo "Disabling ttyname_r, cannot determine prototype." ;;
+       * )     case "$ttyname_r_proto" in
+               REENTRANT_PROTO*) ;;
+               *) ttyname_r_proto="REENTRANT_PROTO_$ttyname_r_proto" ;;
+               esac
+               echo "Prototype: $try" ;;
        esac
        ;;
 esac