summaryrefslogtreecommitdiff
path: root/Python/thread_solaris.h
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-28 13:53:40 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-28 13:53:40 +0300
commitdce235203d23310e1ca12e8a8a8ed8be8e585a12 (patch)
tree7a3b79eef005b8881e3175189ff9db64dd36e2f7 /Python/thread_solaris.h
parent23bb1f0966b9d6b169f929dac91163cec082b741 (diff)
parente5b28bc7ccd71ef30cfee95b1ead7c91c2fdaa8d (diff)
downloadcpython-dce235203d23310e1ca12e8a8a8ed8be8e585a12.tar.gz
#10617: merge with 3.1.
Diffstat (limited to 'Python/thread_solaris.h')
-rw-r--r--Python/thread_solaris.h50
1 files changed, 3 insertions, 47 deletions
diff --git a/Python/thread_solaris.h b/Python/thread_solaris.h
index 56ac8ae40f..1ce1cfcba9 100644
--- a/Python/thread_solaris.h
+++ b/Python/thread_solaris.h
@@ -64,58 +64,14 @@ PyThread_get_thread_ident(void)
return thr_self();
}
-static void
-do_PyThread_exit_thread(int no_cleanup)
-{
- dprintf(("PyThread_exit_thread called\n"));
- if (!initialized)
- if (no_cleanup)
- _exit(0);
- else
- exit(0);
- thr_exit(0);
-}
-
void
PyThread_exit_thread(void)
{
- do_PyThread_exit_thread(0);
-}
-
-void
-PyThread__exit_thread(void)
-{
- do_PyThread_exit_thread(1);
-}
-
-#ifndef NO_EXIT_PROG
-static void
-do_PyThread_exit_prog(int status, int no_cleanup)
-{
- dprintf(("PyThread_exit_prog(%d) called\n", status));
+ dprintf(("PyThread_exit_thread called\n"));
if (!initialized)
- if (no_cleanup)
- _exit(status);
- else
- exit(status);
- if (no_cleanup)
- _exit(status);
- else
- exit(status);
-}
-
-void
-PyThread_exit_prog(int status)
-{
- do_PyThread_exit_prog(status, 0);
-}
-
-void
-PyThread__exit_prog(int status)
-{
- do_PyThread_exit_prog(status, 1);
+ exit(0);
+ thr_exit(0);
}
-#endif /* NO_EXIT_PROG */
/*
* Lock support.