aboutsummaryrefslogtreecommitdiffstats
path: root/e2fsck/unix.c
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-12-31 14:43:20 +0100
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2014-01-05 00:15:37 +0100
commit18a1444b4f1e6a0948fd38fa0de382d86cfe04de (patch)
tree5fd12e10e50c4056337eea6f5f82063d7937c74f /e2fsck/unix.c
parent5fe0b41dba699fa14432a633c863ea8cb7bf3f5d (diff)
downloadandroid_external_e2fsprogs-18a1444b4f1e6a0948fd38fa0de382d86cfe04de.tar.gz
android_external_e2fsprogs-18a1444b4f1e6a0948fd38fa0de382d86cfe04de.tar.bz2
android_external_e2fsprogs-18a1444b4f1e6a0948fd38fa0de382d86cfe04de.zip
Add files that would normally be generated by the e2fsprogs build system
Android doesn't run ./configure and friends, so it has to rely on pre-populated versions of the autogenerated files. This is somewhat bogus (e.g. hardcoded little-endian reference in lib/ext2fs/ext2_types.h) and should at some point be fixed, but it's what Android has always done, not a regression from the 1.41.14 branch. Also, don't #include config.h which we don't generate (we pass what it usually contains as -D parameters from Android.mk) anywhere. Add a new Android.mk file for the quota library. Change-Id: I162c6327fee5bd06261d9cdcc34bda10f04a6f21 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'e2fsck/unix.c')
-rw-r--r--e2fsck/unix.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 6f94644e..56f4924e 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -11,7 +11,6 @@
#define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */
-#include "config.h"
#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@ -68,6 +67,10 @@ e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */
int journal_enable_debug = -1;
#endif
+#ifndef ROOT_SYSCONFDIR
+#define ROOT_SYSCONFDIR "/etc"
+#endif
+
static void usage(e2fsck_t ctx)
{
fprintf(stderr,