summaryrefslogtreecommitdiff
path: root/perl.h
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>1999-12-28 04:08:09 +0000
committerGurusamy Sarathy <gsar@cpan.org>1999-12-28 04:08:09 +0000
commit113b7d9de713e57a510f822be9651ee29df72538 (patch)
tree2dc928b0b86c4a325c0ac408fdcc7751429d9819 /perl.h
parentf83ee824cada302b23f7337a82f3b9d44bde7629 (diff)
parentde0c8cb881313fb53ccecc309c3a182787a8a527 (diff)
downloadperl-113b7d9de713e57a510f822be9651ee29df72538.tar.gz
integrate mainline contents
p4raw-id: //depot/utfperl@4725
Diffstat (limited to 'perl.h')
-rw-r--r--perl.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/perl.h b/perl.h
index 626e413de5..2bba6d467c 100644
--- a/perl.h
+++ b/perl.h
@@ -383,7 +383,8 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
/* HP-UX 10.X CMA (Common Multithreaded Architecure) insists that
pthread.h must be included before all other header files.
*/
-#if defined(USE_THREADS) && defined(PTHREAD_H_FIRST) && defined(I_PTHREAD)
+#if (defined(USE_THREADS) || defined(USE_ITHREADS)) \
+ && defined(PTHREAD_H_FIRST) && defined(I_PTHREAD)
# include <pthread.h>
#endif
@@ -1502,11 +1503,12 @@ typedef struct ptr_tbl PTR_TBL_t;
* May make sense to have threads after "*ish.h" anyway
*/
-#ifdef USE_THREADS
+#if defined(USE_THREADS) || defined(USE_ITHREADS)
+# if defined(USE_THREADS)
/* pending resolution of licensing issues, we avoid the erstwhile
* atomic.h everywhere */
# define EMULATE_ATOMIC_REFCOUNTS
-
+# endif
# ifdef FAKE_THREADS
# include "fakethr.h"
# else
@@ -1537,10 +1539,10 @@ typedef pthread_key_t perl_key;
# endif /* OS2 */
# endif /* WIN32 */
# endif /* FAKE_THREADS */
-#endif /* USE_THREADS */
+#endif /* USE_THREADS || USE_ITHREADS */
#ifdef WIN32
-#include "win32.h"
+# include "win32.h"
#endif
#ifdef VMS