From: Gurusamy Sarathy <gsar@cpan.org>
Date: Sat, 4 Sep 1999 20:21:59 +0000 (+0000)
Subject: integrate cfgperl contents into mainline
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0bf7eb25e9e238046abce47d15e2fa3d10558a02;p=p5sagit%2Fp5-mst-13.2.git

integrate cfgperl contents into mainline

p4raw-id: //depot/perl@4076
---

0bf7eb25e9e238046abce47d15e2fa3d10558a02
diff --cc perl.h
index e3d3826,dae4390..8973317
--- a/perl.h
+++ b/perl.h
@@@ -1685,6 -1702,6 +1702,22 @@@ typedef pthread_key_t	perl_key
  #  endif
  #endif
  
++#if defined(PERL_IMPLICIT_CONTEXT) && !defined(PERL_GET_THX)
++#  ifdef USE_THREADS
++#    define PERL_GET_THX		THR
++#  else
++#  ifdef MULTIPLICITY
++#    define PERL_GET_THX		PERL_GET_INTERP
++#  else
++#  ifdef PERL_OBJECT
++#    define PERL_GET_THX		((CPerlObj*)PERL_GET_INTERP)
++#  else
++#    define PERL_GET_THX		((void*)0)
++#  endif
++#  endif
++#  endif
++#endif
++
  /* Some unistd.h's give a prototype for pause() even though
     HAS_PAUSE ends up undefined.  This causes the #define
     below to be rejected by the compmiler.  Sigh.
diff --cc perlapi.c
index f409754,1945146..1945146
mode 100644,100755..100644
--- a/perlapi.c
+++ b/perlapi.c