diff options
| -rw-r--r-- | ChangeLog-97a | 12 | ||||
| -rw-r--r-- | ace/Thread_Priority.i | 33 | ||||
| -rw-r--r-- | ace/config-linux-lxpthreads.h | 3 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux_lxpthread.GNU | 3 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux_lxpthreads.GNU | 3 |
5 files changed, 25 insertions, 29 deletions
diff --git a/ChangeLog-97a b/ChangeLog-97a index ed723010cb9..0f694a81d10 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -1,3 +1,15 @@ +Wed Jan 29 00:59:12 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * include/makeinclude/platform_linux_lxpthread.GNU (CXX): Removed + the -D_MIT_POSIX_PTHREADS symbol since we're using Xavier's + threads instead. Thanks to Marius Kjeldahl <marius@funcom.com, + mariusk@sn.no> for reporting this. + + * ace/config-linux-lxpthreads.h: Removed the _MIT_POSIX_PTHREADS + symbol since we're using Xavier's threads instead. Thanks to + Marius Kjeldahl <marius@funcom.com, mariusk@sn.no> for reporting + this. + Tue Jan 28 23:32:58 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/SString: Added hash() methods to each ACE String class so diff --git a/ace/Thread_Priority.i b/ace/Thread_Priority.i index e22ae865d8a..a76f7018ff9 100644 --- a/ace/Thread_Priority.i +++ b/ace/Thread_Priority.i @@ -33,50 +33,39 @@ ACE_Thread_Priority::~ACE_Thread_Priority () { } -ACE_INLINE -long -ACE_Thread_Priority::set_priority_class (const Priority_Class priority_class) +ACE_INLINE long +ACE_Thread_Priority::priority_class (const Priority_Class priority_class) { priority_class_ = priority_class; return normalize (); } -ACE_INLINE -long -ACE_Thread_Priority::set_default_thread_priority ( - const Thread_Priority default_thread_priority) +ACE_INLINE long ACE_Thread_Priority::default_thread_priority (const Thread_Priority default_thread_priority) { default_thread_priority_ = default_thread_priority; return normalize (); } -ACE_INLINE -ACE_Thread_Priority::Priority_Class -ACE_Thread_Priority::priority_class () const +ACE_INLINE ACE_Thread_Priority::Priority_Class +ACE_Thread_Priority::priority_class (void) const { return priority_class_; } -ACE_INLINE -ACE_Thread_Priority::Thread_Priority -ACE_Thread_Priority::default_thread_priority () const +ACE_INLINE ACE_Thread_Priority::Thread_Priority +ACE_Thread_Priority::default_thread_priority (void) const { return default_thread_priority_; } -ACE_INLINE -ACE_id_t -ACE_Thread_Priority::os_priority_class () const +ACE_INLINE ACE_id_t +ACE_Thread_Priority::os_priority_class (void) const { return os_priority_class_; } -ACE_INLINE -ACE_pri_t -ACE_Thread_Priority::os_default_thread_priority () const +ACE_INLINE ACE_pri_t +ACE_Thread_Priority::os_default_thread_priority (void) const { return os_default_thread_priority_; } - - -// EOF diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h index cc40e368a60..f65ddae8aaf 100644 --- a/ace/config-linux-lxpthreads.h +++ b/ace/config-linux-lxpthreads.h @@ -129,9 +129,6 @@ #define ACE_HAS_SIGWAIT #define ACE_LACKS_CONDATTR_PSHARED -// To use pthreads on Linux you'll need to use the MIT version, for -// now... -#define _MIT_POSIX_THREADS 1 #include /**/ <pthread.h> #endif /* ACE_CONFIG_H */ diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU index 1e160271131..747cc4a3ef1 100644 --- a/include/makeinclude/platform_linux_lxpthread.GNU +++ b/include/makeinclude/platform_linux_lxpthread.GNU @@ -1,5 +1,4 @@ # For pthreads support on Linux, you need -# -D_MIT_POSIX_THREADS # -D_POSIX_THREADS # -D_POSIX_THREAD_SAFE_FUNCTIONS # in the CXX command line. Also, add -lpthreads to the LIBS. @@ -8,7 +7,7 @@ # Jan Rychter <jwr@icm.edu.pl> CC = gcc -w -CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS +CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread -lstdc++ diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU index 1e160271131..747cc4a3ef1 100644 --- a/include/makeinclude/platform_linux_lxpthreads.GNU +++ b/include/makeinclude/platform_linux_lxpthreads.GNU @@ -1,5 +1,4 @@ # For pthreads support on Linux, you need -# -D_MIT_POSIX_THREADS # -D_POSIX_THREADS # -D_POSIX_THREAD_SAFE_FUNCTIONS # in the CXX command line. Also, add -lpthreads to the LIBS. @@ -8,7 +7,7 @@ # Jan Rychter <jwr@icm.edu.pl> CC = gcc -w -CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS +CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread -lstdc++ |