[PATCH synaptics] Remove psmcomm.h header - superfluous.

Peter Hutterer peter.hutterer at who-t.net
Tue May 11 17:28:04 PDT 2010


Don't need a full header file for 3 include directives of system headers.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/Makefile.am |    2 +-
 src/psmcomm.c   |    4 +++-
 src/psmcomm.h   |   29 -----------------------------
 3 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 src/psmcomm.h

diff --git a/src/Makefile.am b/src/Makefile.am
index e7ee375..cf4a2b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,6 +44,6 @@ endif
 
 if BUILD_PSMCOMM
 @DRIVER_NAME at _drv_la_SOURCES += \
-	psmcomm.c psmcomm.h
+	psmcomm.c
 endif
 
diff --git a/src/psmcomm.c b/src/psmcomm.c
index f5c2b0c..6664c93 100644
--- a/src/psmcomm.c
+++ b/src/psmcomm.c
@@ -39,7 +39,9 @@
 #endif
 
 #include <xorg-server.h>
-#include "psmcomm.h"
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <sys/mouse.h>
 #include <errno.h>
 #include <string.h>
 #include "synproto.h"
diff --git a/src/psmcomm.h b/src/psmcomm.h
deleted file mode 100644
index 07cb528..0000000
--- a/src/psmcomm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.  Red
- * Hat makes no representations about the suitability of this software
- * for any purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _PSMCOMM_H_
-#define _PSMCOMM_H_
-
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/mouse.h>
-
-#endif
-- 
1.7.0.1



More information about the xorg-devel mailing list