summaryrefslogtreecommitdiffstats
path: root/Python/thread_solaris.h
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2010-02-24 00:10:48 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2010-02-24 00:10:48 (GMT)
commit72aee3dcabf98a0b8a7a60cccab4fbd1ef63fbd2 (patch)
tree4d0065384cc092413d520a5d0b6a7774be930a45 /Python/thread_solaris.h
parent640cacbffe62ac3ee806e61fbd00ec242fdfa2a8 (diff)
downloadcpython-72aee3dcabf98a0b8a7a60cccab4fbd1ef63fbd2.zip
cpython-72aee3dcabf98a0b8a7a60cccab4fbd1ef63fbd2.tar.gz
cpython-72aee3dcabf98a0b8a7a60cccab4fbd1ef63fbd2.tar.bz2
Merged revisions 78393 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78393 | amaury.forgeotdarc | 2010-02-24 00:19:39 +0100 (mer., 24 févr. 2010) | 2 lines #4852: Remove dead code in every thread implementation, unused for many years. ........
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 ff3e6f3..59ca002 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.