Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Side by Side Diff: src/libusb-glue.h

Issue 11358153: Update libmtp from pre 1.1.4 git to 1.1.5 release. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libmtp/
Patch Set: disable mptz Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /** 1 /**
2 * \file libusb-glue.h 2 * \file libusb-glue.h
3 * Low-level USB interface glue towards libusb. 3 * Low-level USB interface glue towards libusb.
4 * 4 *
5 * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com> 5 * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com>
6 * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se> 6 * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
7 * Copyright (C) 2006-2011 Marcus Meissner 7 * Copyright (C) 2006-2011 Marcus Meissner
8 * Copyright (C) 2007 Ted Bullock 8 * Copyright (C) 2007 Ted Bullock
9 * Copyright (C) 2008 Chris Bagwell <chris@cnpbagwell.com> 9 * Copyright (C) 2008 Chris Bagwell <chris@cnpbagwell.com>
10 * 10 *
(...skipping 14 matching lines...) Expand all
25 * 25 *
26 * Created by Richard Low on 24/12/2005. 26 * Created by Richard Low on 24/12/2005.
27 * Modified by Linus Walleij 27 * Modified by Linus Walleij
28 * 28 *
29 */ 29 */
30 #ifndef LIBUSB_GLUE_H 30 #ifndef LIBUSB_GLUE_H
31 #define LIBUSB_GLUE_H 31 #define LIBUSB_GLUE_H
32 32
33 #include "ptp.h" 33 #include "ptp.h"
34 #ifdef HAVE_LIBUSB1 34 #ifdef HAVE_LIBUSB1
35 #include "libusb.h" 35 #include <libusb-1.0/libusb.h>
36 #endif 36 #endif
37 #ifdef HAVE_LIBUSB0 37 #ifdef HAVE_LIBUSB0
38 #include <usb.h> 38 #include <usb.h>
39 #endif 39 #endif
40 #ifdef HAVE_LIBOPENUSB 40 #ifdef HAVE_LIBOPENUSB
41 #include <openusb.h> 41 #include <openusb.h>
42 #endif 42 #endif
43 #include "libmtp.h" 43 #include "libmtp.h"
44 #include "device-flags.h" 44 #include "device-flags.h"
45 45
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 /* connect_first_device return codes */ 174 /* connect_first_device return codes */
175 #define PTP_CD_RC_CONNECTED 0 175 #define PTP_CD_RC_CONNECTED 0
176 #define PTP_CD_RC_NO_DEVICES 1 176 #define PTP_CD_RC_NO_DEVICES 1
177 #define PTP_CD_RC_ERROR_CONNECTING 2 177 #define PTP_CD_RC_ERROR_CONNECTING 2
178 178
179 #ifdef __cplusplus 179 #ifdef __cplusplus
180 } 180 }
181 #endif /* __cplusplus */ 181 #endif /* __cplusplus */
182 182
183 #endif // LIBUSB-GLUE_H 183 #endif // LIBUSB-GLUE_H
OLDNEW
« config.h ('K') | « src/libopenusb1-glue.c ('k') | src/libusb-glue.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698