#! /bin/sh /usr/share/dpatch/dpatch-run
## 93_control-0.0.2a-1.5.0.dpatch by Thomas Günther <tom@toms-cafe.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5).

@DPATCH@
--- control-0.0.2a/gateway.c
+++ control-0.0.2a/gateway.c
@@ -100,7 +100,7 @@
 
     if (_stack.poll(100)) {
 
-      uint64 Command = 0;
+      uint64_t Command = 0;
       uint i = 0;
       int t0 = time_ms();
       while (_active && i < sizeof(Command)) {
--- control-0.0.2a/keyboard.c
+++ control-0.0.2a/keyboard.c
@@ -18,7 +18,7 @@
 
 struct tKbdMap {
   eKbdFunc func;
-  uint64 code;
+  uint64_t code;
 };
 
 
@@ -117,7 +117,7 @@
 
 
 
-bool cCtrlKeyboard::intPut(uint64 Command, bool Repeat, bool Release) {
+bool cCtrlKeyboard::intPut(uint64_t Command, bool Repeat, bool Release) {
 
   bool ret = cRemote::Put(Command, Repeat, Release);
 conLOG_KEYB("%s cKbdRemoteForControl::intPut(0x%016LX)", ret ? "true" : "false", Command);
@@ -126,7 +126,7 @@
 
 
 
-bool cCtrlKeyboard::Put(uint64 Command, bool Repeat, bool Release) {
+bool cCtrlKeyboard::Put(uint64_t Command, bool Repeat, bool Release) {
 
   if (! _pRemote)
     _pRemote = new cCtrlKeyboard();
@@ -136,7 +136,7 @@
 
 
 
-int cCtrlKeyboard::MapCodeToFunc(uint64 Code) {
+int cCtrlKeyboard::MapCodeToFunc(uint64_t Code) {
 
   for (const tKbdMap *p = keyboardKbdMap; p->func != kfNone; p++) {
     if (p->code == Code)
--- control-0.0.2a/keyboard.h
+++ control-0.0.2a/keyboard.h
@@ -30,11 +30,11 @@
   cCtrlKeyboard();
   virtual ~cCtrlKeyboard();
 
-  bool intPut(uint64 Command, bool Repeat, bool Release);
+  bool intPut(uint64_t Command, bool Repeat, bool Release);
 
 public:
-  static bool Put(uint64 Command, bool Repeat = false, bool Release = false);
-  static int MapCodeToFunc(uint64 Code);
+  static bool Put(uint64_t Command, bool Repeat = false, bool Release = false);
+  static int MapCodeToFunc(uint64_t Code);
 };
 
 
