diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 01:13:59 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 01:13:59 +0000 |
| commit | 1f7e5edb8b40aa4a2962394461259bf470fff85b (patch) | |
| tree | 6f9481cbe5b953a7ad49bc9f7938764bf9ddc244 | |
| parent | 47fc190d4bd4d8cb6f1a32bf4f0a4ed34d778ccd (diff) | |
| download | ATCD-1f7e5edb8b40aa4a2962394461259bf470fff85b.tar.gz | |
ChangeLogTag:Fri Aug 25 18:09:04 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | ace/OS.cpp | 4 | ||||
| -rw-r--r-- | ace/Thread_Adapter.cpp | 1 | ||||
| -rw-r--r-- | ace/config-win32.h | 10 |
6 files changed, 34 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 29af2b1a7f1..25b353e92e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Aug 25 18:09:04 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/config-win32.h: + * ace/OS.cpp: + * ace/Thread_Adapter.cpp: + Factor out the definition of ACE_ENDTHREADEX to the + config-win32.h file. + Fri Aug 25 17:11:25 2000 Carlos O'Ryan <coryan@uci.edu> * ace/Thread_Control.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 29af2b1a7f1..25b353e92e2 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Fri Aug 25 18:09:04 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/config-win32.h: + * ace/OS.cpp: + * ace/Thread_Adapter.cpp: + Factor out the definition of ACE_ENDTHREADEX to the + config-win32.h file. + Fri Aug 25 17:11:25 2000 Carlos O'Ryan <coryan@uci.edu> * ace/Thread_Control.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 29af2b1a7f1..25b353e92e2 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Fri Aug 25 18:09:04 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/config-win32.h: + * ace/OS.cpp: + * ace/Thread_Adapter.cpp: + Factor out the definition of ACE_ENDTHREADEX to the + config-win32.h file. + Fri Aug 25 17:11:25 2000 Carlos O'Ryan <coryan@uci.edu> * ace/Thread_Control.h: diff --git a/ace/OS.cpp b/ace/OS.cpp index 332fe0d1025..a5623861f85 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -2339,7 +2339,6 @@ ACE_OS::cleanup_tss (const u_int main_thread) } #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) -#define ACE_ENDTHREADEX(STATUS) ::_endthread () #define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ (*THR_ID = ::_beginthreadex ((void(_Optlink*)(void*))ENTRY_POINT, STACK, STACKSIZE, ARGS), *THR_ID) #elif defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) @@ -2379,16 +2378,13 @@ HANDLE WINAPI __IBMCPP__beginthreadex(void *stack, thr_id); } -#define ACE_ENDTHREADEX(STATUS) ::_endthread () #define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ __IBMCPP__beginthreadex(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) #elif defined (ACE_HAS_WINCE) && defined (UNDER_CE) && (UNDER_CE >= 211) -#define ACE_ENDTHREADEX(STATUS) ExitThread ((DWORD) STATUS) #define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ CreateThread (NULL, STACKSIZE, (unsigned long (__stdcall *) (void *)) ENTRY_POINT, ARGS, (FLAGS) & CREATE_SUSPENDED, (unsigned long *) THR_ID) #else -#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) #define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ ::_beginthreadex (STACK, STACKSIZE, (unsigned (__stdcall *) (void *)) ENTRY_POINT, ARGS, FLAGS, (unsigned int *) THR_ID) #endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ diff --git a/ace/Thread_Adapter.cpp b/ace/Thread_Adapter.cpp index 361909a8545..7a54dc5154f 100644 --- a/ace/Thread_Adapter.cpp +++ b/ace/Thread_Adapter.cpp @@ -42,7 +42,6 @@ ACE_Thread_Adapter::sync_log_msg (const ACE_TCHAR *prg) } } - void * ACE_Thread_Adapter::invoke (void) { diff --git a/ace/config-win32.h b/ace/config-win32.h index 58cc18a6fa8..ae61127505d 100644 --- a/ace/config-win32.h +++ b/ace/config-win32.h @@ -23,5 +23,15 @@ # error "Compiler does not seem to be supported" #endif /* _MSC_VER */ +#if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) +# define ACE_ENDTHREADEX(STATUS) ::_endthread () +#elif defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) +# define ACE_ENDTHREADEX(STATUS) ::_endthread () +#elif defined (ACE_HAS_WINCE) && defined (UNDER_CE) && (UNDER_CE >= 211) +# define ACE_ENDTHREADEX(STATUS) ExitThread ((DWORD) STATUS) +#else +# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) +#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ + #include "ace/post.h" #endif /* ACE_CONFIG_H */ |