diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 19:30:37 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 19:30:37 -0200 |
| commit | 697462d8dfd68d3dccca4d7cb97e342652c24fa3 (patch) | |
| tree | e976b72abf5fc0aacb55b4d4bbd0b2e5291bda8c | |
| parent | e0c50fd64a739a53da72efe03f0a5e6aedf9d0da (diff) | |
Janitor: Add matching prototypes to callback functions.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | xtrapout.c | 22 |
2 files changed, 15 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 605f434..1953f86 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ AM_MAINTAINER_MODE m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.2) +AC_TYPE_SIGNAL AM_CONFIG_HEADER(config.h) AC_PROG_CC @@ -88,6 +88,12 @@ SOFTWARE. **-- */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#else +#define RETSIGTYPE void +#endif + #include <stdio.h> #include <X11/extensions/xtraplib.h> #include <X11/extensions/xtraplibp.h> @@ -109,11 +115,11 @@ extern int opterr; /* Forward declarations */ -static void SetGlobalDone (void ); +static RETSIGTYPE SetGlobalDone (int unused ); static void print_req_callback (XETC *tc , XETrapDatum *data , - char *my_buf ); + BYTE *my_buf ); static void print_evt_callback (XETC *tc , XETrapDatum *data , - char *my_buf ); + BYTE *my_buf ); static FILE *ofp; @@ -125,14 +131,14 @@ static XrmOptionDescRec optionTable [] = {"-v", "*verbose", XrmoptionSkipArg, (caddr_t) NULL}, }; -static void SetGlobalDone(void) +static void SetGlobalDone(int unused) { GlobalDone = 1L; fprintf(stderr,"Process Completed!\n"); return; } -static void print_req_callback(XETC *tc, XETrapDatum *data, char *my_buf) +static void print_req_callback(XETC *tc, XETrapDatum *data, BYTE *my_buf) { char *req_type; req_type = (data->u.req.reqType == XETrapGetExtOpcode(tc) ? "XTrap" : @@ -142,7 +148,7 @@ static void print_req_callback(XETC *tc, XETrapDatum *data, char *my_buf) (long)data->u.req.id); } -static void print_evt_callback(XETC *tc, XETrapDatum *data, char *my_buf) +static void print_evt_callback(XETC *tc, XETrapDatum *data, BYTE *my_buf) { static Time last_time = 0; int delta; @@ -273,8 +279,8 @@ main(int argc, char *argv[]) XEPrintCurrent(stderr,&ret_cur); /* Add signal handlers so that we clean up properly */ - _InitExceptionHandling((void_function)SetGlobalDone); - (void)XEEnableCtrlKeys((void_function)SetGlobalDone); + _InitExceptionHandling(SetGlobalDone); + (void)XEEnableCtrlKeys(SetGlobalDone); XETrapAppWhileLoop(app,tc,&GlobalDone); |