cc6117d0f3
+ prune some unused files https://github.com/kinetiknz/nestegg.git commit f46223191d8116a36bf299b5b9793fcb798417b1 Merge: 0851279 4b0190a Author: Matthew Gregan <kinetik@flim.org> AuthorDate: Wed Nov 27 13:50:43 2013 -0800 Commit: Matthew Gregan <kinetik@flim.org> CommitDate: Wed Nov 27 13:50:43 2013 -0800 Merge pull request #15 from shadone/master Fix compiler warning. Change-Id: I59eecdd68fced1ef61b67d446735539628d81484
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
diff --git a/nestegg/halloc/src/halloc.c b/nestegg/halloc/src/halloc.c
|
|
index 5758fc0..837b3ff 100644
|
|
--- a/nestegg/halloc/src/halloc.c
|
|
+++ b/nestegg/halloc/src/halloc.c
|
|
@@ -15,7 +15,7 @@
|
|
#include <stdlib.h> /* realloc */
|
|
#include <string.h> /* memset & co */
|
|
|
|
-#include "halloc.h"
|
|
+#include "nestegg/halloc/halloc.h"
|
|
#include "align.h"
|
|
#include "hlist.h"
|
|
|
|
diff --git a/nestegg/include/nestegg/nestegg.h b/nestegg/include/nestegg/nestegg.h
|
|
index ff13728..c18d1d3 100644
|
|
--- a/nestegg/include/nestegg/nestegg.h
|
|
+++ b/nestegg/include/nestegg/nestegg.h
|
|
@@ -7,7 +7,7 @@
|
|
#if !defined(NESTEGG_671cac2a_365d_ed69_d7a3_4491d3538d79)
|
|
#define NESTEGG_671cac2a_365d_ed69_d7a3_4491d3538d79
|
|
|
|
-#include <nestegg/nestegg-stdint.h>
|
|
+#include "vpx/vpx_integer.h"
|
|
|
|
#if defined(__cplusplus)
|
|
extern "C" {
|
|
diff --git a/nestegg/src/nestegg.c b/nestegg/src/nestegg.c
|
|
index daf1eed..4fb10e7 100644
|
|
--- a/nestegg/src/nestegg.c
|
|
+++ b/nestegg/src/nestegg.c
|
|
@@ -8,8 +8,8 @@
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
-#include "halloc.h"
|
|
-#include "nestegg/nestegg.h"
|
|
+#include "nestegg/halloc/halloc.h"
|
|
+#include "nestegg/include/nestegg/nestegg.h"
|
|
|
|
/* EBML Elements */
|
|
#define ID_EBML 0x1a45dfa3
|