1 From 33e64334db17ed3d2307e3ac465450c5c9b39ad9 Mon Sep 17 00:00:00 2001

     2 From: Paulo Cesar Pereira de Andrade <[email protected]>

     3 Date: Sun, 16 Mar 2008 03:01:23 -0300

     4 Subject: [PATCH] Compile warning fixes.

     5 

     6 Don't call xf86usleep, just call usleep directly.

     7 Remove unused variables.

     8 

     9 Signed-off-by: Peter Hutterer <[email protected]>

    10 ---

    11  src/acecad.c |    3 +--

    12  src/acecad.h |    2 +-

    13  2 files changed, 2 insertions(+), 3 deletions(-)

    14 

    15 diff --git a/src/acecad.c b/src/acecad.c

    16 index 41caa8c..71d2578 100644

    17 --- a/src/acecad.c

    18 +++ b/src/acecad.c

    19 @@ -245,10 +245,9 @@ #ifdef LINUX_SYSFS

    20      char *link = NULL;

    21      struct dlist *devs = NULL;

    22      struct dlist *links = NULL;

    23 -    unsigned int major = 0, minor = 0;

    24      void *libsysfs = NULL;

    25  

    26 -    if (libsysfs = dlopen("libsysfs.so", RTLD_NOW | RTLD_GLOBAL)) {

    27 +    if ((libsysfs = dlopen("libsysfs.so", RTLD_NOW | RTLD_GLOBAL))) {

    28          xf86MsgVerb(X_INFO, verb, "%s: querying sysfs for Acecad tablets\n", local->name);

    29          usb_bus = sysfs_open_bus(usb_bus_name);

    30          if (usb_bus) {

    31 diff --git a/src/acecad.h b/src/acecad.h

    32 index 2f910ea..9acfca2 100644

    33 --- a/src/acecad.h

    34 +++ b/src/acecad.h

    35 @@ -63,7 +63,7 @@ #define AVAIL_FLAG		8

    36  

    37  #define NOTAVAIL ((errno == ENODEV) || (errno == ENXIO) || (errno == ENOENT))

    38  

    39 -#define milisleep(ms) xf86usleep (ms * 1000)

    40 +#define milisleep(ms) usleep (ms * 1000)

    41  

    42  #define SYSCALL(call) while(((call) == -1) && (errno == EINTR))

    43  

    44 -- 

    45 1.4.1

    46