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

Side by Side Diff: patches/01_build_fixes.patch

Issue 2364793002: Revert "Uprev libmtp to 1.1.12" (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master
Patch Set: Created 4 years, 3 months 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
« no previous file with comments | « patches/00_disable_playlist.patch ('k') | patches/02_check_ptp_operation_support.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/src/ptp.h b/src/ptp.h 1 Index: src/unicode.c
2 index 62938b4..f25618c 100644 2 ===================================================================
3 --- a/src/ptp.h 3 --- src/unicode.c» (revision 148519)
4 +++ b/src/ptp.h 4 +++ src/unicode.c» (working copy)
5 @@ -3238,7 +3238,7 @@ uint16_t ptp_olympus_getcameraid (PTPParams*, unsigned cha r**, unsigned int *); 5 @@ -29,7 +29,8 @@
6 *
7 */
8
9 -#include <config.h>
10 +#include "config.h"
11 +
12 #include <stdlib.h>
13 #include <string.h>
14 #ifdef HAVE_ICONV
15 Index: src/playlist-spl.c
16 ===================================================================
17 --- src/playlist-spl.c» (revision 148519)
18 +++ src/playlist-spl.c» (working copy)
19 @@ -21,7 +21,7 @@
20 * Boston, MA 02111-1307, USA.
21 */
22
23 -#include <config.h>
24 +#include "config.h"
25
26 #include <stdio.h>
27 #include <stdlib.h> // mkstmp()
28 Index: src/ptp.h
29 ===================================================================
30 --- src/ptp.h» (revision 148519)
31 +++ src/ptp.h» (working copy)
32 @@ -2808,7 +2808,7 @@
6 static inline int 33 static inline int
7 ptp_operation_issupported(PTPParams* params, uint16_t operation) 34 ptp_operation_issupported(PTPParams* params, uint16_t operation)
8 { 35 {
9 -» unsigned int i=0; 36 -» int i=0;
10 + uint32_t i=0; 37 + uint32_t i=0;
11 38
12 for (;i<params->deviceinfo.OperationsSupported_len;i++) { 39 for (;i<params->deviceinfo.OperationsSupported_len;i++) {
13 if (params->deviceinfo.OperationsSupported[i]==operation) 40 if (params->deviceinfo.OperationsSupported[i]==operation)
OLDNEW
« no previous file with comments | « patches/00_disable_playlist.patch ('k') | patches/02_check_ptp_operation_support.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698