Re: [ANNOUNCE] VDR developer version 2.1.5

[Andrey Pavlenko <andrey.a.pavlenko@xxxxxxxxx>]

Thanks, this patch fixes the error.

On Thu, Mar 6, 2014 at 2:27 PM, Klaus Schmidinger <Klaus.Schmidinger@xxxxxxx> wrote:

On 06.03.2014 11:24, Andrey Pavlenko wrote:

Hi,

The build fails on Ubuntu Precise with error:

ci.c: In member function 'void cCiDateTime::SendDateTime()':
ci.c:867:18: error: expected primary-_expression_ before '.' token
ci.c:867:37: error: expected primary-_expression_ before '.' token
ci.c:867:67: error: expected primary-_expression_ before '.' token
ci.c:867:96: error: expected primary-_expression_ before '.' token
ci.c:867:125: error: expected primary-_expression_ before '.' token
ci.c: In member function 'virtual void cCiMMI::Process(int, const uint8_t*)':
ci.c:1007:47: error: expected primary-_expression_ before '.' token
ci.c:1007:71: error: expected primary-_expression_ before '.' token

However, on Ubuntu Saucy and Trusty the build passes.

Do this to revert that change:

--- ci.c        2014/02/08 12:25:55     3.11
+++ ci.c        2014/02/25 09:59:55     3.12
@@ -864,7 +864,7 @@
 #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)) };
+     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;
      if (DumpDateTime)
@@ -1004,7 +1004,7 @@
                  case DCC_SET_MMI_MODE:
                       if (l == 2 && *++d == MM_HIGH_LEVEL) {
                          struct tDisplayReply { uint8_t id; uint8_t mode; };
-                         tDisplayReply dr = { .id = DRI_MMI_MODE_ACK, .mode = MM_HIGH_LEVEL };
+                         tDisplayReply dr = { id : DRI_MMI_MODE_ACK, mode : MM_HIGH_LEVEL };
                          dbgprotocol("Slot %d: ==> Display Reply (%d)\n", Tc()->CamSlot()->SlotNumber(), SessionId());
                          SendData(AOT_DISPLAY_REPLY, 2, (uint8_t *)&dr);

                          }


Klaus

_______________________________________________
vdr mailing list
vdr@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr

_______________________________________________
vdr mailing list
vdr@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr