From 8ecc0efb6b4b7a336131df7f50dfad881e968a94 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Sun, 30 Mar 2003 22:44:19 +0200
Subject: [PATCH] Reverted. The destruct order is back to normal again so those
safeguards are no longer necessary.
Rev: src/backend.cmod:1.41
Rev: src/pike_threadlib.h:1.35
---
src/backend.cmod | 7 ++-----
src/pike_threadlib.h | 6 +++---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/backend.cmod b/src/backend.cmod
index 15e3bb83af..6625f34313 100644
--- a/src/backend.cmod
+++ b/src/backend.cmod
@@ -2,11 +2,11 @@
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
-|| $Id: backend.cmod,v 1.40 2003/03/30 12:44:00 grubba Exp $
+|| $Id: backend.cmod,v 1.41 2003/03/30 20:44:19 mast Exp $
*/
#include "global.h"
-RCSID("$Id: backend.cmod,v 1.40 2003/03/30 12:44:00 grubba Exp $");
+RCSID("$Id: backend.cmod,v 1.41 2003/03/30 20:44:19 mast Exp $");
#include "fdlib.h"
#include "backend.h"
#include <errno.h>
@@ -2107,9 +2107,6 @@ PMOD_EXPORT int write_to_stderr(char *a, size_t len)
#define WRAP(CB) \
void PIKE_CONCAT(set_,CB)(int fd,file_callback cb,void *data) \
{ \
- if (!default_backend && !cb && !data && !get_backend_for_fd(fd)) { \
- return; \
- } \
PIKE_CONCAT(backend_set_,CB)(really_get_backend_for_fd(fd),fd,cb, data); \
} \
\
diff --git a/src/pike_threadlib.h b/src/pike_threadlib.h
index 717c5bc557..d49f2dbc6b 100644
--- a/src/pike_threadlib.h
+++ b/src/pike_threadlib.h
@@ -2,7 +2,7 @@
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
-|| $Id: pike_threadlib.h,v 1.34 2003/03/30 13:09:51 grubba Exp $
+|| $Id: pike_threadlib.h,v 1.35 2003/03/30 20:44:19 mast Exp $
*/
#ifndef PIKE_THREADLIB_H
@@ -659,7 +659,7 @@ PMOD_EXPORT extern int Pike_in_gc;
#define THREADS_DISALLOW() \
REVEAL_GLOBAL_VARIABLES(); \
- if(_tmp && _tmp->swapped) { \
+ if(_tmp->swapped) { \
low_mt_lock_interpreter(); \
THREADS_FPRINTF(1, (stderr, "THREADS_DISALLOW() %s:%d t:%08x(#%d)\n", \
__FILE__, __LINE__, \
@@ -706,7 +706,7 @@ PMOD_EXPORT extern int Pike_in_gc;
#define THREADS_DISALLOW_UID() \
REVEAL_GLOBAL_VARIABLES(); \
- if(_tmp_uid && _tmp_uid->swapped) { \
+ if(_tmp_uid->swapped) { \
low_mt_lock_interpreter(); \
live_threads--; \
THREADS_FPRINTF(1, (stderr, \
--
GitLab