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

Side by Side Diff: source/libvpx/third_party/nestegg/0001-include-paths.diff

Issue 341293003: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
(Empty)
1 diff --git a/nestegg/halloc/src/halloc.c b/nestegg/halloc/src/halloc.c
2 index 5758fc0..837b3ff 100644
3 --- a/nestegg/halloc/src/halloc.c
4 +++ b/nestegg/halloc/src/halloc.c
5 @@ -15,7 +15,7 @@
6 #include <stdlib.h> /* realloc */
7 #include <string.h> /* memset & co */
8
9 -#include "halloc.h"
10 +#include "third_party/nestegg/halloc/halloc.h"
11 #include "align.h"
12 #include "hlist.h"
13
14 diff --git a/nestegg/include/nestegg/nestegg.h b/nestegg/include/nestegg/nestegg .h
15 index ff13728..c18d1d3 100644
16 --- a/nestegg/include/nestegg/nestegg.h
17 +++ b/nestegg/include/nestegg/nestegg.h
18 @@ -7,7 +7,7 @@
19 #if !defined(NESTEGG_671cac2a_365d_ed69_d7a3_4491d3538d79)
20 #define NESTEGG_671cac2a_365d_ed69_d7a3_4491d3538d79
21
22 -#include <nestegg/nestegg-stdint.h>
23 +#include "vpx/vpx_integer.h"
24
25 #if defined(__cplusplus)
26 extern "C" {
27 diff --git a/nestegg/src/nestegg.c b/nestegg/src/nestegg.c
28 index daf1eed..4fb10e7 100644
29 --- a/nestegg/src/nestegg.c
30 +++ b/nestegg/src/nestegg.c
31 @@ -8,8 +8,8 @@
32 #include <stdlib.h>
33 #include <string.h>
34
35 -#include "halloc.h"
36 -#include "nestegg/nestegg.h"
37 +#include "third_party/nestegg/halloc/halloc.h"
38 +#include "third_party/nestegg/include/nestegg/nestegg.h"
39
40 /* EBML Elements */
41 #define ID_EBML 0x1a45dfa3
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698