From 3bb7a7e86cee43708531ca483436dc784574d036 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 14 Jan 2012 13:47:56 +0100 Subject: [PATCH] make lt_dfbinput a c++ file this allows to put the videowatchdog into the same thread later Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/5732251e245e890ed6869b50c732e1f989861db5 Author: Stefan Seyfried Date: 2012-01-14 (Sat, 14 Jan 2012) ------------------ This commit was generated by Migit --- libtriple/Makefile.am | 2 +- libtriple/init_td.cpp | 2 +- libtriple/{lt_dfbinput.c => lt_dfbinput.cpp} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename libtriple/{lt_dfbinput.c => lt_dfbinput.cpp} (99%) diff --git a/libtriple/Makefile.am b/libtriple/Makefile.am index 9128ad2..ba38724 100644 --- a/libtriple/Makefile.am +++ b/libtriple/Makefile.am @@ -6,7 +6,7 @@ noinst_LIBRARIES = libtriple.a AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing libtriple_a_SOURCES = \ - lt_dfbinput.c \ + lt_dfbinput.cpp \ lt_debug.cpp \ dmx_td.cpp \ ca.cpp \ diff --git a/libtriple/init_td.cpp b/libtriple/init_td.cpp index 7447dcf..07e576c 100644 --- a/libtriple/init_td.cpp +++ b/libtriple/init_td.cpp @@ -15,8 +15,8 @@ extern "C" { #include #include #include -#include "lt_dfbinput.h" } +#include "lt_dfbinput.h" #include "lt_debug.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args) diff --git a/libtriple/lt_dfbinput.c b/libtriple/lt_dfbinput.cpp similarity index 99% rename from libtriple/lt_dfbinput.c rename to libtriple/lt_dfbinput.cpp index 45a483a..0a2ada1 100644 --- a/libtriple/lt_dfbinput.c +++ b/libtriple/lt_dfbinput.cpp @@ -129,7 +129,7 @@ static DFBEnumerationResult enum_input_device(DFBInputDeviceID device_id, DFBInputDeviceDescription desc, void *data) { - DeviceInfo **devices = data; + DeviceInfo **devices = (DeviceInfo **)data; DeviceInfo *device; device = (DeviceInfo *)malloc(sizeof(DeviceInfo));