From b6ced0eb08503fa8768ff97658ff199a16e39883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 4 Dec 2016 19:21:20 +0100 Subject: Kopete - avdevice: Use standard integer types instead of Linux specific This resolves FTBFS on FreeBSD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 46042bc67e2ab5df2f486bf78b78b421fc67b59c) --- kopete/libkopete/avdevice/videocontrol.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'kopete/libkopete/avdevice') diff --git a/kopete/libkopete/avdevice/videocontrol.h b/kopete/libkopete/avdevice/videocontrol.h index af6b5138..783723f4 100644 --- a/kopete/libkopete/avdevice/videocontrol.h +++ b/kopete/libkopete/avdevice/videocontrol.h @@ -27,14 +27,10 @@ #if defined(__linux__) #include #endif +#ifdef HAVE_STDINT_H +#include +#endif #undef __STRICT_ANSI__ -#ifndef __u64 //required by videodev.h -#define __u64 unsigned long long -#endif // __u64 - -#ifndef __s64 //required by videodev.h -#define __s64 long long -#endif // __s64 #include #include @@ -71,14 +67,14 @@ public: ~VideoControl(); protected: - __u32 m_id; + uint32_t m_id; control_type m_type; TQString m_name; - __s32 m_minimum; - __s32 m_maximum; - __s32 m_step; - __s32 m_default; - __u32 m_flags; + int32_t m_minimum; + int32_t m_maximum; + int32_t m_step; + int32_t m_default; + uint32_t m_flags; }; } -- cgit v1.2.1