From eb2fd51daa46b4c500a8f9f67da030df96f11e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Mon, 6 Nov 2000 18:03:32 +0100
Subject: [PATCH] do_exit() is now pike_do_exit(). Fixes [bug 640].
Rev: src/main.c:1.106
Rev: src/main.h:1.14
Rev: src/threads.c:1.143
---
src/main.c | 6 +++---
src/main.h | 4 ++--
src/threads.c | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main.c b/src/main.c
index ddbf2b3502..4280f5d225 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,7 +5,7 @@
\*/
/**/
#include "global.h"
-RCSID("$Id: main.c,v 1.105 2000/10/10 00:02:51 hubbe Exp $");
+RCSID("$Id: main.c,v 1.106 2000/11/06 17:03:32 grubba Exp $");
#include "fdlib.h"
#include "backend.h"
#include "module.h"
@@ -571,14 +571,14 @@ int dbm_main(int argc, char **argv)
}
UNSETJMP(back);
- do_exit(num);
+ pike_do_exit(num);
return num; /* avoid warning */
}
#undef ATTRIBUTE
#define ATTRIBUTE(X)
-DECLSPEC(noreturn) void do_exit(int num) ATTRIBUTE((noreturn))
+DECLSPEC(noreturn) void pike_do_exit(int num) ATTRIBUTE((noreturn))
{
call_callback(&exit_callbacks, (void *)0);
free_callback_list(&exit_callbacks);
diff --git a/src/main.h b/src/main.h
index 3979605f86..868d058c0f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -5,7 +5,7 @@
\*/
/*
- * $Id: main.h,v 1.13 2000/08/21 21:37:12 grubba Exp $
+ * $Id: main.h,v 1.14 2000/11/06 17:03:32 grubba Exp $
*/
#ifndef MAIN_H
#define MAIN_H
@@ -36,7 +36,7 @@ struct callback *add_exit_callback(callback_func call,
void *arg,
callback_func free_func);
int dbm_main(int argc, char **argv);
-DECLSPEC(noreturn) void do_exit(int num) ATTRIBUTE((noreturn));
+DECLSPEC(noreturn) void pike_do_exit(int num) ATTRIBUTE((noreturn));
void low_init_main(void);
void exit_main(void);
void init_main(void);
diff --git a/src/threads.c b/src/threads.c
index 21210f690a..0f4d330e1a 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -1,5 +1,5 @@
#include "global.h"
-RCSID("$Id: threads.c,v 1.142 2000/11/06 16:46:42 mast Exp $");
+RCSID("$Id: threads.c,v 1.143 2000/11/06 17:03:32 grubba Exp $");
PMOD_EXPORT int num_threads = 1;
PMOD_EXPORT int threads_disabled = 0;
@@ -633,7 +633,7 @@ TH_RETURN_TYPE new_thread_func(void * data)
if(throw_severity == THROW_EXIT)
{
free((char *) data);
- do_exit(throw_value.u.integer);
+ pike_do_exit(throw_value.u.integer);
}
} else {
INT32 args=arg.args->size;
--
GitLab