Clean up xinput.h a bit

Remove the unnecessary NeedFunctionPrototypes ifdef.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

2 files changed, 32 insertions, 268 deletions

diff --git a/src/xinput.c b/src/xinput.c
index f584459..b0a2858 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -25,12 +25,8 @@
 #include <ctype.h>
 #include <string.h>
 
-typedef int (*prog)(
-#if NeedFunctionPrototypes
-		    Display* display, int argc, char *argv[],
-		    char *prog_name, char *prog_desc
-#endif
-);
+typedef int (*prog)(Display* display, int argc, char *argv[],
+		    char *prog_name, char *prog_desc);
 
 typedef struct
 {
diff --git a/src/xinput.h b/src/xinput.h
index 24c0417..c4a6f8f 100644
--- a/src/xinput.h
+++ b/src/xinput.h
@@ -38,266 +38,34 @@
 #define EXIT_FAILURE 0
 #endif
 
-XDeviceInfo*
-find_device_info(
-#if NeedFunctionPrototypes
-		 Display	*display,
-		 char		*name,
-		 Bool		only_extended
-#endif
-		 );
-int
-get_feedbacks(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-set_ptr_feedback(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-get_button_map(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-set_button_map(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-set_pointer(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-set_mode(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-list(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-test(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-version(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-set_integer_feedback(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-query_state(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-create_master(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-remove_master(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-change_attachment(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-float_device(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-set_clientpointer(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-list_props(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-
-int
-set_int_prop(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-set_float_prop(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-set_atom_prop(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-watch_props(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-delete_prop(
-#if NeedFunctionPrototypes
-		 Display*	display,
-		 int		argc,
-		 char		*argv[],
-		 char		*prog_name,
-		 char		*prog_desc
-#endif
-);
-
-int
-set_prop(
-#if NeedFunctionPrototypes
-		Display*	display,
-		int		argc,
-		char		*argv[],
-		char		*prog_name,
-		char		*prog_desc
-#endif
-);
-
+XDeviceInfo* find_device_info( Display *display, char *name, Bool only_extended);
+
+int get_feedbacks( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_ptr_feedback( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int get_button_map( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_button_map( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_pointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+
+int set_mode( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int list( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int test( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int version( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_integer_feedback( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int query_state( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+
+/* X Input 1.5 */
+int list_props( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_int_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_float_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_atom_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int watch_props( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int delete_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+
+/* X Input 2.0 */
+int create_master( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int remove_master( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int change_attachment( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int float_device( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_clientpointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 /* end of xinput.h */