summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2009-04-18 09:37:54 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2009-04-18 09:37:54 +0200
commitb83439b87e8e93ed5330d1f38d53577ebfdedaea (patch)
treead9cacc2360b61aa0507787b941768779d4efce3
parent5b57bdebdcecf9e544cbf0af72b77106efa62d8f (diff)
downloadvdr-b83439b87e8e93ed5330d1f38d53577ebfdedaea.tar.gz
vdr-b83439b87e8e93ed5330d1f38d53577ebfdedaea.tar.bz2
Fixed the MEGABYTE() macro to make it correctly handle parameters resulting in values larger than 2GB
-rw-r--r--HISTORY4
-rw-r--r--tools.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index e694d565..8504f465 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6031,7 +6031,7 @@ Video Disk Recorder Revision History
Oliver Endriss for reporting this).
- Improved efficiency of cEIT::cEIT() (thanks to Tobias Bratfisch).
-2009-04-13: Version 1.7.6
+2009-04-18: Version 1.7.6
- cDevice::PlayTs() now syncs on the TS packet sync bytes.
- Made MAXFRAMESIZE a multiple of TS_SIZE to avoid breaking up TS packets.
@@ -6041,3 +6041,5 @@ Video Disk Recorder Revision History
(thanks to Helmut Auer).
- Added cThread::SetIOPriority() and using it in cRemoveDeletedRecordingsThread
(thanks to Rolf Ahrenberg).
+- Fixed the MEGABYTE() macro to make it correctly handle parameters resulting in
+ values larger than 2GB.
diff --git a/tools.h b/tools.h
index e660967b..22b7e99b 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: tools.h 2.1 2008/05/22 10:26:57 kls Exp $
+ * $Id: tools.h 2.2 2009/04/14 20:41:39 kls Exp $
*/
#ifndef __TOOLS_H
@@ -38,7 +38,7 @@ extern int SysLogLevel;
#define SECSINDAY 86400
#define KILOBYTE(n) ((n) * 1024)
-#define MEGABYTE(n) ((n) * 1024 * 1024)
+#define MEGABYTE(n) ((n) * 1024LL * 1024LL)
#define MALLOC(type, size) (type *)malloc(sizeof(type) * (size))