summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sys/v4l2/gstv4l2element.h4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 047ef448..c8b1c7b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-12 Edward Hervey <edward@fluendo.com>
+
+ * sys/v4l2/gstv4l2element.h:
+ Remove tim's addition of "_stdint.h" since it doesn't make the PPC
+ buildbot happy.
+ I will just use the same comment Ronald used when he added these lines:
+ Yet Another Hack (tm) for kernel header borkedness.
+
2006-03-12 Tim-Philipp Müller <tim at centricular dot net>
* ext/taglib/Makefile.am:
diff --git a/sys/v4l2/gstv4l2element.h b/sys/v4l2/gstv4l2element.h
index 71442039..23a6dd81 100644
--- a/sys/v4l2/gstv4l2element.h
+++ b/sys/v4l2/gstv4l2element.h
@@ -23,8 +23,6 @@
#ifndef __GST_V4L2ELEMENT_H__
#define __GST_V4L2ELEMENT_H__
-#include "_stdint.h"
-
/* Because of some really cool feature in video4linux1, also known as
* 'not including sys/types.h and sys/time.h', we had to include it
* ourselves. In all their intelligence, these people decided to fix
@@ -38,7 +36,9 @@
* errors here, check your linux/time.h && sys/time.h header setup.
*/
#include <sys/types.h>
+#include <linux/types.h>
#define _LINUX_TIME_H
+#define __user
#include <linux/videodev2.h>
#include <gst/gst.h>