@@ -1,8 +1,8 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 - * Jonathan Schleifer + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 + * Jonathan Schleifer * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in @@ -15,13 +15,18 @@ */ #include "config.h" #include + +#include #ifdef HAVE_SYS_IOCTL_H # include +#endif +#ifdef HAVE_SYS_TERMIOS_H +# include #endif #import "OFDate.h" #import "OFStdIOStream.h" #import "OFTimer.h" @@ -204,11 +209,11 @@ - (void)calculateBPSAndETA { _BPS = (float)(_received - _lastReceived) / -(float)[_lastReceivedDate timeIntervalSinceNow]; - _ETA = (double)(_length - _resumedFrom - _received) / _BPS; + _ETA = (double)(_length - _received) / _BPS; _lastReceived = _received; [_lastReceivedDate release]; _lastReceivedDate = [[OFDate alloc] init]; }