summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kopete/libkopete/avdevice/videocontrol.h22
1 files changed, 9 insertions, 13 deletions
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 <asm/types.h>
#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#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 <tqstring.h>
#include <kdebug.h>
@@ -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;
};
}