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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/01_build_fixes.patch
diff --git a/patches/01_build_fixes.patch b/patches/01_build_fixes.patch
index a93039c587243cab882bbe6b0a72761608b856f7..3630a229b35909e4e0c588ca0a6451f5737d0bde 100644
--- a/patches/01_build_fixes.patch
+++ b/patches/01_build_fixes.patch
@@ -1,12 +1,39 @@
-diff --git a/src/ptp.h b/src/ptp.h
-index 62938b4..f25618c 100644
---- a/src/ptp.h
-+++ b/src/ptp.h
-@@ -3238,7 +3238,7 @@ uint16_t ptp_olympus_getcameraid (PTPParams*, unsigned char**, unsigned int *);
+Index: src/unicode.c
+===================================================================
+--- src/unicode.c (revision 148519)
++++ src/unicode.c (working copy)
+@@ -29,7 +29,8 @@
+ *
+ */
+
+-#include <config.h>
++#include "config.h"
++
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef HAVE_ICONV
+Index: src/playlist-spl.c
+===================================================================
+--- src/playlist-spl.c (revision 148519)
++++ src/playlist-spl.c (working copy)
+@@ -21,7 +21,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <config.h>
++#include "config.h"
+
+ #include <stdio.h>
+ #include <stdlib.h> // mkstmp()
+Index: src/ptp.h
+===================================================================
+--- src/ptp.h (revision 148519)
++++ src/ptp.h (working copy)
+@@ -2808,7 +2808,7 @@
static inline int
ptp_operation_issupported(PTPParams* params, uint16_t operation)
{
-- unsigned int i=0;
+- int i=0;
+ uint32_t i=0;
for (;i<params->deviceinfo.OperationsSupported_len;i++) {
« 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