diff options
| author | Kristjan Valur Jonsson <sweskman@gmail.com> | 2011-03-30 11:24:58 +0000 |
|---|---|---|
| committer | Kristjan Valur Jonsson <sweskman@gmail.com> | 2011-03-30 11:24:58 +0000 |
| commit | c1b1930e7591b395dee499765ec40dfb946b019c (patch) | |
| tree | b4c52b0c46bc31544d6ad32ed7ff1bb501e60d80 /Python/thread_solaris.h | |
| parent | 6e5ebc654984fbc7db6148197a89d0e7d4cf435c (diff) | |
| parent | 2bb0258a88cb339cafb87163c7194484dff0efd9 (diff) | |
| download | cpython-c1b1930e7591b395dee499765ec40dfb946b019c.tar.gz | |
Merge 3.1
Diffstat (limited to 'Python/thread_solaris.h')
| -rw-r--r-- | Python/thread_solaris.h | 50 |
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. |