diff options
| author | Nathan Hjelm <hjelmn@me.com> | 2011-07-21 22:34:12 -0600 |
|---|---|---|
| committer | Peter Stuge <peter@stuge.se> | 2011-09-22 10:46:48 +0200 |
| commit | d1bd234f7e1b1ff4168b8f605e2038e87a0e361f (patch) | |
| tree | f60064676053c338eae753db2ee487a0e3d24090 /libusb/libusbi.h | |
| parent | a97762a8a121de1ad3deb9e861088b69bb6a155b (diff) | |
| download | android_external_libusbx-d1bd234f7e1b1ff4168b8f605e2038e87a0e361f.tar.gz android_external_libusbx-d1bd234f7e1b1ff4168b8f605e2038e87a0e361f.tar.bz2 android_external_libusbx-d1bd234f7e1b1ff4168b8f605e2038e87a0e361f.zip | |
Fix #64 use of reserved identifiers throughout libusb
Diffstat (limited to 'libusb/libusbi.h')
| -rw-r--r-- | libusb/libusbi.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libusb/libusbi.h b/libusb/libusbi.h index 564ee3e..f1b12d0 100644 --- a/libusb/libusbi.h +++ b/libusb/libusbi.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBUSBI_H__ -#define __LIBUSBI_H__ +#ifndef LIBUSBI_H +#define LIBUSBI_H #include <config.h> @@ -109,8 +109,8 @@ static inline void list_del(struct list_head *entry) } #define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) + const typeof( ((type *)0)->member ) *mptr = (ptr); \ + (type *)( (char *)mptr - offsetof(type,member) );}) #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b)) @@ -186,7 +186,7 @@ static inline void usbi_dbg(const char *format, ...) #define HANDLE_CTX(handle) (DEVICE_CTX((handle)->dev)) #define TRANSFER_CTX(transfer) (HANDLE_CTX((transfer)->dev_handle)) #define ITRANSFER_CTX(transfer) \ - (TRANSFER_CTX(__USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer))) + (TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer))) /* Internal abstractions for thread synchronization and poll */ #if defined(THREADS_POSIX) @@ -342,10 +342,10 @@ enum usbi_transfer_flags { USBI_TRANSFER_DEVICE_DISAPPEARED = 1 << 3, }; -#define __USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer) \ +#define USBI_TRANSFER_TO_LIBUSB_TRANSFER(transfer) \ ((struct libusb_transfer *)(((unsigned char *)(transfer)) \ + sizeof(struct usbi_transfer))) -#define __LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer) \ +#define LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer) \ ((struct usbi_transfer *)(((unsigned char *)(transfer)) \ - sizeof(struct usbi_transfer))) |