diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-07-11 08:12:45 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-07-11 08:12:45 +0000 |
| commit | 378a7e927649dcfaab9e0e54a1dc3c106724ecd3 (patch) | |
| tree | 701dd94bbe081cbec38cf9e421391d37dbc37af1 /packages/gparted/files/gparted-0.3.3-llabs.patch | |
| parent | dfcf279e7b654887d36c3763ddc91890b47b1044 (diff) | |
| parent | 0aad8b50511c04a4dfda2b43d4e450c3b4b9a9fb (diff) | |
merge of '4d01e12fde33f43c99f3c6215f4514d9f9d24479'
and 'aa44d626baaae40ee498aea453176a8aea90d9fc'
Diffstat (limited to 'packages/gparted/files/gparted-0.3.3-llabs.patch')
| -rw-r--r-- | packages/gparted/files/gparted-0.3.3-llabs.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/packages/gparted/files/gparted-0.3.3-llabs.patch b/packages/gparted/files/gparted-0.3.3-llabs.patch new file mode 100644 index 0000000000..07c4020e57 --- /dev/null +++ b/packages/gparted/files/gparted-0.3.3-llabs.patch @@ -0,0 +1,72 @@ +--- src/GParted_Core.cc 2006/09/25 21:49:32 1.1 ++++ src/GParted_Core.cc 2006/09/25 22:03:31 +@@ -1604,7 +1604,7 @@ bool GParted_Core::copy_filesystem( cons + + while ( succes && + timer .elapsed() <= smallest_time && +- std::llabs( done ) + N <= length && ++ llabs( done ) + N <= length && + optimal_blocksize * 2 < N ) + { + if ( done != 0 ) +@@ -1648,7 +1648,7 @@ bool GParted_Core::copy_filesystem( cons + dst_device, + src_start + ( dst_start > src_start ? 0 : done ), + dst_start + ( dst_start > src_start ? 0 : done ), +- length - std::llabs( done ), ++ length - llabs( done ), + optimal_blocksize, + operationdetail, + readonly, +@@ -1822,7 +1822,7 @@ bool GParted_Core::copy_blocks( const Gl + if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) ) + { + Glib::ustring error_message ; +- buf = static_cast<char *>( malloc( std::llabs( blocksize ) * 512 ) ) ; ++ buf = static_cast<char *>( malloc( llabs( blocksize ) * 512 ) ) ; + if ( buf ) + { + ped_device_sync( lp_device_dst ) ; +@@ -1843,7 +1843,7 @@ bool GParted_Core::copy_blocks( const Gl + operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ; + + Glib::Timer timer_progress_timeout, timer_total ; +- while( succes && std::llabs( done ) < length ) ++ while( succes && llabs( done ) < length ) + { + succes = copy_block( lp_device_src, + lp_device_dst, +@@ -1858,7 +1858,7 @@ bool GParted_Core::copy_blocks( const Gl + if ( timer_progress_timeout .elapsed() >= 0.5 ) + { + set_progress_info( length, +- std::llabs( done + blocksize ), ++ llabs( done + blocksize ), + timer_total, + operationdetail .get_last_child() .get_last_child(), + readonly ) ; +@@ -1877,13 +1877,13 @@ bool GParted_Core::copy_blocks( const Gl + + //final description + operationdetail .get_last_child() .get_last_child() .set_description( +- String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), std::llabs( done ), length ), FONT_ITALIC ) ; ++ String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), llabs( done ), length ), FONT_ITALIC ) ; + + if ( ! succes && ! error_message .empty() ) + operationdetail .get_last_child() .add_child( + OperationDetail( error_message, STATUS_NONE, FONT_ITALIC ) ) ; + +- total_done += std::llabs( done ) ; ++ total_done += llabs( done ) ; + + //close and destroy the devices.. + ped_device_close( lp_device_src ) ; +@@ -1912,7 +1912,7 @@ bool GParted_Core::copy_block( PedDevice + + if ( blocksize < 0 ) + { +- blocksize = std::llabs( blocksize ) ; ++ blocksize = llabs( blocksize ) ; + offset_src -= ( blocksize -1 ) ; + offset_dst -= ( blocksize -1 ) ; + } |