summaryrefslogtreecommitdiff
path: root/ext4_utils/make_ext4fs.c
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-10-05 12:44:18 -0700
committerTao Bao <tbao@google.com>2016-10-09 08:58:56 -0700
commit018ef1be61e749d0fbe0f05179a4f0f9b858ae57 (patch)
treec497988d98c219e85e892722b524ccdab6ddaa84 /ext4_utils/make_ext4fs.c
parent329e73bda60d544aed7207982987262de0a8f4a8 (diff)
downloadextras-018ef1be61e749d0fbe0f05179a4f0f9b858ae57.tar.gz
ext4_utils: Export headers for libext4_utils* libs.
So we can do "#include <ext4_utils/make_ext4fs.h>" without adding "LOCAL_C_INCLUDES += system/extras/ext4_utils". Also clean up the #include lines in system/extras/ext4_utils/. Test: `m checkbuild` works. Change-Id: I3c8b07c9b6f5996160e0cb6d9d069579b1609f60
Diffstat (limited to 'ext4_utils/make_ext4fs.c')
-rw-r--r--ext4_utils/make_ext4fs.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index 744cf0af..a1cfe060 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -14,13 +14,11 @@
* limitations under the License.
*/
-#include "make_ext4fs.h"
-#include "ext4_utils.h"
-#include "allocate.h"
-#include "contents.h"
-#include "wipe.h"
+#include "ext4_utils/make_ext4fs.h"
-#include <sparse/sparse.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
#include <assert.h>
#include <dirent.h>
@@ -30,9 +28,16 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <unistd.h>
+
+#include <sparse/sparse.h>
+
+#include "allocate.h"
+#include "contents.h"
+#include "ext4_utils/ext4_utils.h"
+#include "ext4_utils/wipe.h"
#ifdef _WIN32