summaryrefslogtreecommitdiff
path: root/tools.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2006-12-03 18:00:00 +0100
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2006-12-03 18:00:00 +0100
commit287cd613a1d5d08fb56e107460473132d23e3ca0 (patch)
treee435c0a89775a14016f8f5d1043f30d06de210bf /tools.c
parentbc67a03157def5c4d8d0f3c7b38351f2aeb397ee (diff)
downloadvdr-patch-lnbsharing-287cd613a1d5d08fb56e107460473132d23e3ca0.tar.gz
vdr-patch-lnbsharing-287cd613a1d5d08fb56e107460473132d23e3ca0.tar.bz2
Version 1.4.4-1vdr-1.4.4-1
- Some improvements to the man pages (thanks to Ville Skyttä). - Fixed a possible segfault in cSkins::Message() (thanks to Udo Richter). - Made the getskyepg.pl script of the 'sky' plugin send a user agent message to the server, according to the rules at http://bleb.org/tv/data/listings. If your version of 'wget' doesn't support the -U option to set the user agent, use the new option -U of getskyepg.pl to have the information added to the URL as a query string. - The getskyepg.pl script now replaces "&amp;" with "&". - Fixed a possible crash in remux.c on 64-bit machines (thanks to Reinhard Nissl). - Fixed a typo in the change to the "Use small font" setup option in version 1.3.47 in the HISTORY and CONTRIBUTORS file (reported by Andreas Brugger). - Added a missing 'const' to cRecordingInfo::ChannelID() (reported by Andreas Brugger). This required the APIVERSION to be increased, so plugins will have to be recompiled. - Now calling cPluginManager::Active() only if VDR is really trying to shut down, and waiting for 5 minutes before calling it again (thanks to Jörg Wendel for reporting that cPlugin::Active() was called too often, and to Udo Richter for some hints on how to improve this). - Replaced 'unsigned long' with 'uint32_t' and 'uint64' with 'uint64_t' to avoid problems on 64-bit machines.
Diffstat (limited to 'tools.c')
-rw-r--r--tools.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools.c b/tools.c
index 8ec1e69..255c806 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: tools.c 1.120 2006/08/12 13:30:07 kls Exp $
+ * $Id: tools.c 1.121 2006/12/02 11:12:59 kls Exp $
*/
#include "tools.h"
@@ -547,11 +547,11 @@ cTimeMs::cTimeMs(void)
Set();
}
-uint64 cTimeMs::Now(void)
+uint64_t cTimeMs::Now(void)
{
struct timeval t;
if (gettimeofday(&t, NULL) == 0)
- return (uint64(t.tv_sec)) * 1000 + t.tv_usec / 1000;
+ return (uint64_t(t.tv_sec)) * 1000 + t.tv_usec / 1000;
return 0;
}
@@ -565,7 +565,7 @@ bool cTimeMs::TimedOut(void)
return Now() >= begin;
}
-uint64 cTimeMs::Elapsed(void)
+uint64_t cTimeMs::Elapsed(void)
{
return Now() - begin;
}