svn commit: r269891 - in user/jceel/soc2014_evdev/contrib/libevdev: libevdev test

[Jakub Wojciech Klama]

Author: jceel
Date: Tue Aug 12 20:03:23 2014
New Revision: 269891
URL: http://svnweb.freebsd.org/changeset/base/269891

Log:
  Use correct include paths under FreeBSD.

Modified:
  user/jceel/soc2014_evdev/contrib/libevdev/libevdev/libevdev-uinput.c
  user/jceel/soc2014_evdev/contrib/libevdev/libevdev/libevdev.h
  user/jceel/soc2014_evdev/contrib/libevdev/libevdev/make-event-names.py
  user/jceel/soc2014_evdev/contrib/libevdev/test/test-common-uinput.c
  user/jceel/soc2014_evdev/contrib/libevdev/test/test-kernel.c
  user/jceel/soc2014_evdev/contrib/libevdev/test/test-libevdev-events.c
  user/jceel/soc2014_evdev/contrib/libevdev/test/test-libevdev-has-event.c
  user/jceel/soc2014_evdev/contrib/libevdev/test/test-uinput.c

Modified: user/jceel/soc2014_evdev/contrib/libevdev/libevdev/libevdev-uinput.c
==============================================================================
--- user/jceel/soc2014_evdev/contrib/libevdev/libevdev/libevdev-uinput.c	Tue Aug 12 19:57:12 2014	(r269890)
+++ user/jceel/soc2014_evdev/contrib/libevdev/libevdev/libevdev-uinput.c	Tue Aug 12 20:03:23 2014	(r269891)
@@ -30,7 +30,12 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <time.h>
-#include <linux/uinput.h>
+
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#else
+#include <linux/input.h>
+#endif
 
 #include "libevdev.h"
 #include "libevdev-int.h"

Modified: user/jceel/soc2014_evdev/contrib/libevdev/libevdev/libevdev.h
==============================================================================
--- user/jceel/soc2014_evdev/contrib/libevdev/libevdev/libevdev.h	Tue Aug 12 19:57:12 2014	(r269890)
+++ user/jceel/soc2014_evdev/contrib/libevdev/libevdev/libevdev.h	Tue Aug 12 20:03:23 2014	(r269891)
@@ -27,7 +27,11 @@
 extern "C" {
 #endif
 
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#else
 #include <linux/input.h>
+#endif
 #include <stdarg.h>
 
 #define LIBEVDEV_ATTRIBUTE_PRINTF(_format, _args) __attribute__ ((format (printf, _format, _args)))

Modified: user/jceel/soc2014_evdev/contrib/libevdev/libevdev/make-event-names.py
==============================================================================
--- user/jceel/soc2014_evdev/contrib/libevdev/libevdev/make-event-names.py	Tue Aug 12 19:57:12 2014	(r269890)
+++ user/jceel/soc2014_evdev/contrib/libevdev/libevdev/make-event-names.py	Tue Aug 12 20:03:23 2014	(r269891)
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Parses linux/input.h scanning for #define KEY_FOO 134
+# Parses input.h scanning for #define KEY_FOO 134
 # Prints C header files or Python files that can be used as
 # mapping and lookup tables.
 #

Modified: user/jceel/soc2014_evdev/contrib/libevdev/test/test-common-uinput.c
==============================================================================
--- user/jceel/soc2014_evdev/contrib/libevdev/test/test-common-uinput.c	Tue Aug 12 19:57:12 2014	(r269890)
+++ user/jceel/soc2014_evdev/contrib/libevdev/test/test-common-uinput.c	Tue Aug 12 20:03:23 2014	(r269891)
@@ -27,7 +27,11 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
+#ifdef __FreeBSD__
+#include <dev/evdev/uinput.h>
+#else
 #include <linux/uinput.h>
+#endif
 #include <dirent.h>
 
 #include <libevdev/libevdev.h>

Modified: user/jceel/soc2014_evdev/contrib/libevdev/test/test-kernel.c
==============================================================================
--- user/jceel/soc2014_evdev/contrib/libevdev/test/test-kernel.c	Tue Aug 12 19:57:12 2014	(r269890)
+++ user/jceel/soc2014_evdev/contrib/libevdev/test/test-kernel.c	Tue Aug 12 20:03:23 2014	(r269891)
@@ -29,7 +29,12 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
+
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#else
 #include <linux/input.h>
+#endif
 
 #include <libevdev/libevdev.h>
 #include <libevdev/libevdev-uinput.h>

Modified: user/jceel/soc2014_evdev/contrib/libevdev/test/test-libevdev-events.c
==============================================================================
--- user/jceel/soc2014_evdev/contrib/libevdev/test/test-libevdev-events.c	Tue Aug 12 19:57:12 2014	(r269890)
+++ user/jceel/soc2014_evdev/contrib/libevdev/test/test-libevdev-events.c	Tue Aug 12 20:03:23 2014	(r269891)
@@ -21,7 +21,11 @@
  */
 
 #include <config.h>
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#else
 #include <linux/input.h>
+#endif
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>

Modified: user/jceel/soc2014_evdev/contrib/libevdev/test/test-libevdev-has-event.c
==============================================================================
--- user/jceel/soc2014_evdev/contrib/libevdev/test/test-libevdev-has-event.c	Tue Aug 12 19:57:12 2014	(r269890)
+++ user/jceel/soc2014_evdev/contrib/libevdev/test/test-libevdev-has-event.c	Tue Aug 12 20:03:23 2014	(r269891)
@@ -21,7 +21,11 @@
  */
 
 #include <config.h>
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#else
 #include <linux/input.h>
+#endif
 #include <errno.h>
 #include <unistd.h>
 #include <limits.h>

Modified: user/jceel/soc2014_evdev/contrib/libevdev/test/test-uinput.c
==============================================================================
--- user/jceel/soc2014_evdev/contrib/libevdev/test/test-uinput.c	Tue Aug 12 19:57:12 2014	(r269890)
+++ user/jceel/soc2014_evdev/contrib/libevdev/test/test-uinput.c	Tue Aug 12 20:03:23 2014	(r269891)
@@ -21,7 +21,11 @@
  */
 
 #include <config.h>
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#else
 #include <linux/input.h>
+#endif
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>