diff --git a/lib/libtriple/Makefile.am b/lib/libtriple/Makefile.am index 9128ad262..ba38724b6 100644 --- a/lib/libtriple/Makefile.am +++ b/lib/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/lib/libtriple/init_td.cpp b/lib/libtriple/init_td.cpp index 7447dcf7f..07e576c89 100644 --- a/lib/libtriple/init_td.cpp +++ b/lib/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/lib/libtriple/lt_dfbinput.c b/lib/libtriple/lt_dfbinput.cpp similarity index 99% rename from lib/libtriple/lt_dfbinput.c rename to lib/libtriple/lt_dfbinput.cpp index 45a483a8c..0a2ada1f1 100644 --- a/lib/libtriple/lt_dfbinput.c +++ b/lib/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));