aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2010-03-15 16:11:19 +0000
committerMike Buland <eichlan@xagasoft.com>2010-03-15 16:11:19 +0000
commit85315f2cc85a0c44055cd94c1b7de8cfe11b46e1 (patch)
tree8f6ffe7e908866a227cb74deb906d5a0ea1de42d
parent14a460c60b162aefaf1798c71ac790ad574e739f (diff)
downloadlibbu++-85315f2cc85a0c44055cd94c1b7de8cfe11b46e1.tar.gz
libbu++-85315f2cc85a0c44055cd94c1b7de8cfe11b46e1.tar.bz2
libbu++-85315f2cc85a0c44055cd94c1b7de8cfe11b46e1.tar.xz
libbu++-85315f2cc85a0c44055cd94c1b7de8cfe11b46e1.zip
Ito is updated and is more posix compliant.
-rw-r--r--src/formatter.cpp4
-rw-r--r--src/ito.cpp6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/formatter.cpp b/src/formatter.cpp
index 27925b0..7ebe256 100644
--- a/src/formatter.cpp
+++ b/src/formatter.cpp
@@ -239,7 +239,11 @@ Bu::Formatter &Bu::operator<<( Bu::Formatter &f, Bu::Formatter::Special s )
239 { 239 {
240 case Formatter::nl: 240 case Formatter::nl:
241 { 241 {
242#ifdef WIN32
243 f.write("\r\n", 2 );
244#else
242 f.write("\n", 1 ); 245 f.write("\n", 1 );
246#endif
243 char ci = f.getIndentChar(); 247 char ci = f.getIndentChar();
244 for( int j = 0; j < f.getIndent(); j++ ) 248 for( int j = 0; j < f.getIndent(); j++ )
245 f.write( &ci, 1 ); 249 f.write( &ci, 1 );
diff --git a/src/ito.cpp b/src/ito.cpp
index c922fd0..dba1a87 100644
--- a/src/ito.cpp
+++ b/src/ito.cpp
@@ -25,14 +25,16 @@ bool Bu::Ito::start()
25 25
26bool Bu::Ito::stop() 26bool Bu::Ito::stop()
27{ 27{
28 pthread_exit( &ptHandle ); 28 pthread_cancel( ptHandle );
29 29
30 return true; 30 return true;
31} 31}
32 32
33void *Bu::Ito::threadRunner( void *pThread ) 33void *Bu::Ito::threadRunner( void *pThread )
34{ 34{
35 return ((Ito *)pThread)->run(); 35 void *pRet = ((Ito *)pThread)->run();
36 pthread_exit( pRet );
37 return pRet;
36} 38}
37 39
38bool Bu::Ito::join() 40bool Bu::Ito::join()