diff options
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks6.9.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 98d47d76000..9c4f7f1e3b4 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 21 14:52:02 UTC 2012 Adam Mitz <mitza@ociweb.com> + + * ace/OS_NS_Thread.inl: + * ace/config-vxworks6.9.h: + + Fixed errors from fuzz script. + Tue Feb 21 14:37:47 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * PROBLEM-REPORT-FORM: diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 0e6cf39e6d0..186874c9224 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -45,9 +45,9 @@ void **& ACE_TSS_Emulation::tss_base () { # if defined (ACE_HAS_VXTHREADS) - #if (ACE_VXWORKS <= 0x680) + #if (ACE_VXWORKS <= 0x680) int &spare = taskIdCurrent->ACE_VXWORKS_SPARE; - #else // VxWorks 6.9 updated datatype (WIND00241209) see taskLib.h + #else // VxWorks 6.9 updated datatype (WIND00241209) see taskLib.h long &spare = taskIdCurrent->ACE_VXWORKS_SPARE; #endif return reinterpret_cast <void **&> (spare); diff --git a/ACE/ace/config-vxworks6.9.h b/ACE/ace/config-vxworks6.9.h index 575eecf0706..071b4a53636 100644 --- a/ACE/ace/config-vxworks6.9.h +++ b/ACE/ace/config-vxworks6.9.h @@ -17,7 +17,7 @@ #include "ace/config-vxworks6.8.h" #ifndef ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -// already defined for earlier RTP versions +// already defined for earlier RTP versions # define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1 #endif |