From 0f195698878453b250ac5a5bcfcaf9b1da95d4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Fri, 11 Oct 1996 09:48:12 +0200
Subject: [PATCH] bugfix?
Rev: src/modules/spider/lock.c:1.3
Rev: src/modules/spider/sharedmem.c:1.4
Rev: src/modules/spider/spider.c:1.11
---
src/modules/spider/lock.c | 4 +++-
src/modules/spider/sharedmem.c | 3 ++-
src/modules/spider/spider.c | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/modules/spider/lock.c b/src/modules/spider/lock.c
index a22eaad5f9..fa94ed26a8 100644
--- a/src/modules/spider/lock.c
+++ b/src/modules/spider/lock.c
@@ -1,5 +1,5 @@
#include "global.h"
-#if defined(HAVE_PTHREAD_MUTEX_UNLOCK) || defined(HAVE_MUTEX_UNLOCK)
+#if defined(_REENTRANT) || defined(HAVE_MUTEX_UNLOCK)
#include <sys/types.h>
@@ -93,7 +93,9 @@ mylock_t *newlock( int id )
{
pthread_mutexattr_t attributes;
pthread_mutexattr_init( &attributes );
+#ifdef PTHREAD_PROCESS_SHARED
pthread_mutexattr_setpshared( &attributes, PTHREAD_PROCESS_SHARED );
+#endif
pthread_mutex_init( &lock->lock, &attributes );
pthread_mutexattr_destroy( &attributes );
}
diff --git a/src/modules/spider/sharedmem.c b/src/modules/spider/sharedmem.c
index 6646e281a5..0ec9f24f89 100644
--- a/src/modules/spider/sharedmem.c
+++ b/src/modules/spider/sharedmem.c
@@ -1,9 +1,10 @@
+#include "global.h"
#include <sys/types.h>
#ifdef HAVE_THREAD_H
# include <thread.h>
#else
-# ifdef HAVE_PTHREAD_H
+# if defined(_REENTRANT) && defined(HAVE_PTHREAD_H)
# include <pthread.h>
# endif
#endif
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index 3d051f75f3..3c2cefca15 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -1778,7 +1778,7 @@ void init_spider_efuns(void)
"function(int:int)", OPT_SIDE_EFFECT);
-#if defined(HAVE_PTHREAD_MUTEX_UNLOCK) || defined(HAVE_MUTEX_UNLOCK)
+#if defined(_REENTRANT) || defined(HAVE_MUTEX_UNLOCK)
add_efun("_lock", f_lock, "function(int:int)", OPT_SIDE_EFFECT);
add_efun("_unlock", f_unlock, "function(int:int)", OPT_SIDE_EFFECT);
add_efun("_free_lock", f_freelock, "function(int:int)", OPT_SIDE_EFFECT);
--
GitLab