diff options
| author | Nikolai Kondrashov <spbnick@gmail.com> | 2011-12-26 15:21:14 +0200 |
|---|---|---|
| committer | Nikolai Kondrashov <spbnick@gmail.com> | 2011-12-26 16:26:12 +0200 |
| commit | e7507b80ad60ba2b2f891c75538653a865f4d8b9 (patch) | |
| tree | e96ef9bcff157c21fec157f26415c8dabb2fad78 | |
| parent | 903ec93fd8aa7c4b894a39dd56743939ffbcb302 (diff) | |
| download | usbhid-dump-e7507b80ad60ba2b2f891c75538653a865f4d8b9.tar.gz | |
Rename ERROR/FAILURE to GENERIC_ERROR/FAILURE
Rename ERROR and FAILURE macros in usbhid-dump.c to GENERIC_ERROR and
GENERIC_FAILURE respectively. This is needed to avoid clashes with ERROR define
in wingdi.h on cygwin.
| -rw-r--r-- | src/usbhid-dump.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/usbhid-dump.c b/src/usbhid-dump.c index b6af848..d22cc10 100644 --- a/src/usbhid-dump.c +++ b/src/usbhid-dump.c @@ -42,33 +42,33 @@ #include <getopt.h> #include <stdio.h> -#define ERROR(_fmt, _args...) \ +#define GENERIC_ERROR(_fmt, _args...) \ fprintf(stderr, _fmt "\n", ##_args) #define IFACE_ERROR(_iface, _fmt, _args...) \ - ERROR("%s:" _fmt, _iface->addr_str, ##_args) + GENERIC_ERROR("%s:" _fmt, _iface->addr_str, ##_args) -#define FAILURE(_fmt, _args...) \ - ERROR("Failed to " _fmt, ##_args) +#define GENERIC_FAILURE(_fmt, _args...) \ + GENERIC_ERROR("Failed to " _fmt, ##_args) #define IFACE_FAILURE(_iface, _fmt, _args...) \ IFACE_ERROR(_iface, "Failed to " _fmt, ##_args) #define LIBUSB_FAILURE(_fmt, _args...) \ - FAILURE(_fmt ": %s", ##_args, libusb_strerror(err)) + GENERIC_FAILURE(_fmt ": %s", ##_args, libusb_strerror(err)) #define LIBUSB_IFACE_FAILURE(_iface, _fmt, _args...) \ IFACE_FAILURE(_iface, _fmt ": %s", ##_args, libusb_strerror(err)) #define ERROR_CLEANUP(_fmt, _args...) \ do { \ - ERROR(_fmt, ##_args); \ + GENERIC_ERROR(_fmt, ##_args); \ goto cleanup; \ } while (0) #define FAILURE_CLEANUP(_fmt, _args...) \ do { \ - FAILURE(_fmt, ##_args); \ + GENERIC_FAILURE(_fmt, ##_args); \ goto cleanup; \ } while (0) |