diff options
author | Pete Batard <pete@akeo.ie> | 2012-07-02 23:39:19 +0100 |
---|---|---|
committer | Pete Batard <pete@akeo.ie> | 2012-07-03 11:01:41 +0100 |
commit | 7ec94a45ed8155e7a1d4d5d75575099b09c78834 (patch) | |
tree | ac57151fceac382b0e80567f2563bb44efb88e91 /libusb/libusb.h | |
parent | 63f569be66a40a720bb797a87c3589f3e4de925a (diff) | |
download | libusb-7ec94a45ed8155e7a1d4d5d75575099b09c78834.tar.gz |
Core: Prefix LOG_LEVEL_ with LIBUSB_ to avoid conflicts
* The LOG_LEVEL_ enums, that were moved to the public API
in 933a319469bcccc962031c989e39d9d1f44f2885 may conflict
with applications/headers that also define their own
LOG_LEVEL_ values internally.
* As a matter of fact, as per Trac #31, this produces a
conflict with libusb-compat, as it defines its own levels.
Diffstat (limited to 'libusb/libusb.h')
-rw-r--r-- | libusb/libusb.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libusb/libusb.h b/libusb/libusb.h index fd231ea..1dc12f8 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -951,20 +951,20 @@ enum libusb_capability { /** \ingroup lib * Log message levels. - * - LOG_LEVEL_NONE (0) : no messages ever printed by the library (default) - * - LOG_LEVEL_ERROR (1) : error messages are printed to stderr - * - LOG_LEVEL_WARNING (2) : warning and error messages are printed to stderr - * - LOG_LEVEL_INFO (3) : informational messages are printed to stdout, warning + * - LIBUSB_LOG_LEVEL_NONE (0) : no messages ever printed by the library (default) + * - LIBUSB_LOG_LEVEL_ERROR (1) : error messages are printed to stderr + * - LIBUSB_LOG_LEVEL_WARNING (2) : warning and error messages are printed to stderr + * - LIBUSB_LOG_LEVEL_INFO (3) : informational messages are printed to stdout, warning * and error messages are printed to stderr - * - LOG_LEVEL_DEBUG (4) : debug and informational messages are printed to stdout, + * - LIBUSB_LOG_LEVEL_DEBUG (4) : debug and informational messages are printed to stdout, * warnings and errors to stderr */ -enum usbi_log_level { - LOG_LEVEL_NONE = 0, - LOG_LEVEL_ERROR, - LOG_LEVEL_WARNING, - LOG_LEVEL_INFO, - LOG_LEVEL_DEBUG, +enum libusb_log_level { + LIBUSB_LOG_LEVEL_NONE = 0, + LIBUSB_LOG_LEVEL_ERROR, + LIBUSB_LOG_LEVEL_WARNING, + LIBUSB_LOG_LEVEL_INFO, + LIBUSB_LOG_LEVEL_DEBUG, }; int LIBUSB_CALL libusb_init(libusb_context **ctx); |