From 549c499501c375228fb58a7eaf96cb4f65e0d407 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Wed, 22 Jan 2014 09:41:08 +0100
Subject: Fixed a wrong alignment in cCiDateTime::SendDateTime()

---
 HISTORY | 3 ++-
 ci.c    | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index 29a89894..e77122f9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8132,7 +8132,7 @@ Video Disk Recorder Revision History
   and also to use the correct directory with --edit (the latter reported by Marko
   Mäkelä).
 
-2014-01-20: Version 2.1.4
+2014-01-22: Version 2.1.4
 
 - Updated 'sources.conf' (thanks to Antti Hartikainen).
 - cFont::CreateFont() now returns a dummy font in case there are no fonts installed.
@@ -8157,3 +8157,4 @@ Video Disk Recorder Revision History
 - Now unassigning CAMs from their devices when they are no longer used.
 - Now making sure the primary device goes into transfer mode for live viewing if the
   CAM wants to receive the TS data.
+- Fixed a wrong alignment in cCiDateTime::SendDateTime().
diff --git a/ci.c b/ci.c
index 1d55ca7f..7b4aad46 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 3.8 2014/01/16 11:43:33 kls Exp $
+ * $Id: ci.c 3.9 2014/01/22 09:39:06 kls Exp $
  */
 
 #include "ci.h"
@@ -865,7 +865,9 @@ void cCiDateTime::SendDateTime(void)
      int L = (M == 1 || M == 2) ? 1 : 0;
      int MJD = 14956 + D + int((Y - L) * 365.25) + int((M + 1 + L * 12) * 30.6001);
 #define DEC2BCD(d) uint8_t(((d / 10) << 4) + (d % 10))
+#pragma pack(1)
      struct tTime { uint16_t mjd; uint8_t h, m, s; short offset; };
+#pragma pack()
      tTime T = { mjd : htons(MJD), h : DEC2BCD(tm_gmt.tm_hour), m : DEC2BCD(tm_gmt.tm_min), s : DEC2BCD(tm_gmt.tm_sec), offset : short(htons(tm_loc.tm_gmtoff / 60)) };
      bool OldDumpTPDUDataTransfer = DumpTPDUDataTransfer;
      DumpTPDUDataTransfer &= DumpDateTime;
-- 
cgit v1.2.3