From owner-svn-src-user@FreeBSD.ORG  Thu Jul 10 10:32:03 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8D9FFAF0;
 Thu, 10 Jul 2014 10:32:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 612712AF0;
 Thu, 10 Jul 2014 10:32:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6AAW3OS005142;
 Thu, 10 Jul 2014 10:32:03 GMT (envelope-from jceel@svn.freebsd.org)
Received: (from jceel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6AAW2Rb005135;
 Thu, 10 Jul 2014 10:32:02 GMT (envelope-from jceel@svn.freebsd.org)
Message-Id: <201407101032.s6AAW2Rb005135@svn.freebsd.org>
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
Date: Thu, 10 Jul 2014 10:32:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r268489 -
 user/jceel/soc2014_evdev/contrib/python-evdev/evdev
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jul 2014 10:32:03 -0000

Author: jceel
Date: Thu Jul 10 10:32:02 2014
New Revision: 268489
URL: http://svnweb.freebsd.org/changeset/base/268489

Log:
  Pick up evdev headers from correct location on FreeBSD.

Modified:
  user/jceel/soc2014_evdev/contrib/python-evdev/evdev/genecodes.py
  user/jceel/soc2014_evdev/contrib/python-evdev/evdev/input.c
  user/jceel/soc2014_evdev/contrib/python-evdev/evdev/uinput.c

Modified: user/jceel/soc2014_evdev/contrib/python-evdev/evdev/genecodes.py
==============================================================================
--- user/jceel/soc2014_evdev/contrib/python-evdev/evdev/genecodes.py	Thu Jul 10 10:00:10 2014	(r268488)
+++ user/jceel/soc2014_evdev/contrib/python-evdev/evdev/genecodes.py	Thu Jul 10 10:32:02 2014	(r268489)
@@ -11,7 +11,11 @@ import os, sys, re
 
 template = r'''
 #include <Python.h>
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#else
 #include <linux/input.h>
+#endif
 
 /* Automatically generated by evdev.genecodes */
 /* Generated on %s */

Modified: user/jceel/soc2014_evdev/contrib/python-evdev/evdev/input.c
==============================================================================
--- user/jceel/soc2014_evdev/contrib/python-evdev/evdev/input.c	Thu Jul 10 10:00:10 2014	(r268488)
+++ user/jceel/soc2014_evdev/contrib/python-evdev/evdev/input.c	Thu Jul 10 10:32:02 2014	(r268489)
@@ -18,7 +18,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#else
 #include <linux/input.h>
+#endif
 
 #define MAX_NAME_SIZE 256
 

Modified: user/jceel/soc2014_evdev/contrib/python-evdev/evdev/uinput.c
==============================================================================
--- user/jceel/soc2014_evdev/contrib/python-evdev/evdev/uinput.c	Thu Jul 10 10:00:10 2014	(r268488)
+++ user/jceel/soc2014_evdev/contrib/python-evdev/evdev/uinput.c	Thu Jul 10 10:32:02 2014	(r268489)
@@ -8,9 +8,13 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#include <dev/evdev/uinput.h>
+#else
 #include <linux/input.h>
 #include <linux/uinput.h>
-
+#endif
 
 int _uinput_close(int fd)
 {