From 53ffab14a8e58920460e2675b4ff4235bb9076d6 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Tue, 10 Aug 1999 02:19:00 +0200
Subject: [PATCH] New define PIKE_THREADS for use instead of _REENTRANT in
threads.h so it doesn't get confused in modules defining that one.
Rev: src/acconfig.h:1.46
Rev: src/configure.in:1.305
Rev: src/threads.h:1.68
---
src/acconfig.h | 3 ++-
src/configure.in | 3 ++-
src/threads.h | 6 +++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/acconfig.h b/src/acconfig.h
index 940fa66156..91d671adec 100644
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -1,5 +1,5 @@
/*
- * $Id: acconfig.h,v 1.45 1999/07/15 16:54:33 hubbe Exp $
+ * $Id: acconfig.h,v 1.46 1999/08/10 00:18:58 mast Exp $
*/
#ifndef MACHINE_H
#define MACHINE_H
@@ -212,6 +212,7 @@
#undef USHRT_MAX
/* Define these if you are going to use threads */
+#undef PIKE_THREADS
#undef _REENTRANT
#undef _THREAD_SAFE
diff --git a/src/configure.in b/src/configure.in
index 93c0974a53..c2d1b62297 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.304 1999/08/07 23:42:47 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.305 1999/08/10 00:18:59 mast Exp $")
AC_INIT(interpret.c)
AC_CONFIG_HEADER(machine.h)
@@ -1162,6 +1162,7 @@ fi
########################################################################
if test x$with_threads = xyes ; then
+ AC_DEFINE(PIKE_THREADS)
OLDLIBS="$LIBS"
OLDCFLAGS="$CFLAGS"
diff --git a/src/threads.h b/src/threads.h
index a6a641476c..20551ca68f 100644
--- a/src/threads.h
+++ b/src/threads.h
@@ -1,5 +1,5 @@
/*
- * $Id: threads.h,v 1.67 1999/05/12 04:45:59 hubbe Exp $
+ * $Id: threads.h,v 1.68 1999/08/10 00:19:00 mast Exp $
*/
#ifndef THREADS_H
#define THREADS_H
@@ -12,7 +12,7 @@
/* Needed for pthread_t on OSF/1 */
#include <sys/types.h>
#endif /* HAVE_SYS_TYPES_H */
-#ifdef _REENTRANT
+#ifdef PIKE_THREADS
/*
* Decide which type of threads to use
@@ -603,7 +603,7 @@ void th_farm(void (*fun)(void *), void *here);
#define init_threads_disable(X)
#define exit_threads_disable(X)
-#endif /* _REENTRANT */
+#endif /* PIKE_THREADS */
#ifdef __NT__
#ifndef PIKE_DEBUG
--
GitLab