VM/ESA feedback for #2028.

p4raw-id: //depot/cfgperl@2031

3 files changed, 3 insertions, 45 deletions

diff --git a/Configure b/Configure
index 1452c039b5..329beedf78 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Tue Oct 20 11:18:44 EET DST 1998 [metaconfig 3.0 PL70]
+# Generated on Wed Oct 21 12:24:45 EET DST 1998 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by jhi@iki.fi)
 
 cat >/tmp/c1$$ <<EOF
@@ -701,7 +701,6 @@ installprivlib=''
 privlib=''
 privlibexp=''
 prototype=''
-pthread_setdetachstate_pointer=''
 ptrsize=''
 drand01=''
 randbits=''
@@ -10528,37 +10527,6 @@ rp="What is the type of process ids on this system?"
 set pid_t pidtype int stdio.h sys/types.h
 eval $typedef_ask
 
-
-: see whether the state of pthread_attr_setdetachstate is an int pointer
-$cat >try.c <<EOP
-#include <pthread.h>
-main() {
-    pthread_attr_t attr;
-    int state = 0;	
-    pthread_attr_init(&attr);
-#ifdef POINTER
-    pthread_attr_setdetachstate(&attr, &state);
-#else
-    pthread_attr_setdetachstate(&attr, state);
-#endif
-}
-EOP
-set try
-if eval $compile; then
-    val="$undef"
-else
-    set try -DPOINTER
-    if eval $compile; then
-        val="$define"
-    else
-        val="$undef"
-    fi
-fi
-set pthread_setdetachstate_pointer
-eval $setvar
-
-$rm -f try try.*
-
 : check for length of pointer
 echo " "
 case "$ptrsize" in
@@ -12648,7 +12616,6 @@ prefixexp='$prefixexp'
 privlib='$privlib'
 privlibexp='$privlibexp'
 prototype='$prototype'
-pthread_setdetachstate_pointer='$pthread_setdetachstate_pointer'
 ptrsize='$ptrsize'
 randbits='$randbits'
 randfunc='$randfunc'
diff --git a/config_h.SH b/config_h.SH
index 163b4e7654..b9db158df3 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -2280,13 +2280,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_pthreads_created_joinable PTHREADS_CREATED_JOINABLE /**/
 
-/* PTHREAD_SETDETACHSTATE_POINTER:
- *	This symbol, if defined, indicates that the second argument of
- *	pthread_attr_setdetachstate is a pointer to an int, as opposed
- *	to an int.
- */
-#$pthread_setdetachstate_pointer	PTHREAD_SETDETACHSTATE_POINTER	/**/
-
 /* MULTIPLICITY:
  *	This symbol, if defined, indicates that Perl should
  *	be built to use multiplicity.
diff --git a/thread.h b/thread.h
index bca5f83bfe..58e70fb6b2 100644
--- a/thread.h
+++ b/thread.h
@@ -11,7 +11,7 @@
 	    croak("panic: DETACH");		\
 	}					\
     } STMT_END
-#    define THR getTHR
+#    define THR getTHR()
 struct perl_thread *getTHR _((void));
 #    define PTHREAD_GETSPECIFIC_INT
 #    ifdef DJGPP
@@ -27,6 +27,7 @@ struct perl_thread *getTHR _((void));
 #      define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_setdetach_np(a,s)
 #      define pthread_key_create(k,d) pthread_keycreate(k,(pthread_destructor_t)(d))
 #      define pthread_mutexattr_init(a) pthread_mutexattr_create(a)
+#      define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t)
 #    endif
 #    if defined(DJGPP) || defined(__OPEN_VM)
 #      define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_attr_setdetachstate(a,&(s))
@@ -35,9 +36,6 @@ struct perl_thread *getTHR _((void));
 #    if defined(DJGPP) || defined(VMS)
 #      define PTHREAD_CREATE(t,a,s,d) pthread_create(t,a,s,d)
 #    endif
-#    if defined(__OPEN_VM) || defined(VMS)
-#      define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t)
-#    endif
 #  endif
 #  ifndef VMS
 #    define pthread_mutexattr_default NULL