summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-14 22:47:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-14 22:47:49 +0000
commit4f8b7fb2b3e3b3d492568931d241c6b14ac3bd6b (patch)
treeb9b134cb42134d1a99a5c6ac61d26b1b18cf8a46
parent27b55c2640bf9bcff7fb17d4651d6a36f1645760 (diff)
parente88872597bccca3625e54c508882e0bd1baefa89 (diff)
downloadbsdiff-4f8b7fb2b3e3b3d492568931d241c6b14ac3bd6b.tar.gz
Merge "Expose patch reader for consumption" am: 952ddd532b am: 7b331f19d9 am: e88872597b
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1535865 Change-Id: I3abeec795a25ec1579d5a19f26b9db94c0579474
-rw-r--r--bspatch.cc2
-rw-r--r--include/bsdiff/decompressor_interface.h (renamed from decompressor_interface.h)0
-rw-r--r--include/bsdiff/patch_reader.h (renamed from patch_reader.h)0
3 files changed, 1 insertions, 1 deletions
diff --git a/bspatch.cc b/bspatch.cc
index d7f1710..e95b9a2 100644
--- a/bspatch.cc
+++ b/bspatch.cc
@@ -33,8 +33,8 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
-#include <stdio.h>
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
diff --git a/decompressor_interface.h b/include/bsdiff/decompressor_interface.h
index 46ee444..46ee444 100644
--- a/decompressor_interface.h
+++ b/include/bsdiff/decompressor_interface.h
diff --git a/patch_reader.h b/include/bsdiff/patch_reader.h
index fe0451b..fe0451b 100644
--- a/patch_reader.h
+++ b/include/bsdiff/patch_reader.h