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_wince.h | |
parent | 6e5ebc654984fbc7db6148197a89d0e7d4cf435c (diff) | |
parent | 2bb0258a88cb339cafb87163c7194484dff0efd9 (diff) | |
download | cpython-c1b1930e7591b395dee499765ec40dfb946b019c.tar.gz |
Merge 3.1
Diffstat (limited to 'Python/thread_wince.h')
-rw-r--r-- | Python/thread_wince.h | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/Python/thread_wince.h b/Python/thread_wince.h index 33cf5a4fad..51ddc02f9a 100644 --- a/Python/thread_wince.h +++ b/Python/thread_wince.h @@ -53,48 +53,13 @@ long PyThread_get_thread_ident(void) return GetCurrentThreadId(); } -static void do_PyThread_exit_thread(int no_cleanup) -{ - dprintf(("%ld: do_PyThread_exit_thread called\n", PyThread_get_thread_ident())); - if (!initialized) - if (no_cleanup) - exit(0); /* XXX - was _exit()!! */ - else - exit(0); - _endthread(); -} - 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(("%ld: PyThread_exit_thread called\n", PyThread_get_thread_ident())); if (!initialized) - 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); + _endthread(); } -#endif /* NO_EXIT_PROG */ /* * Lock support. It has to be implemented using Mutexes, as |