da2eba0f3a
API_LEVEL=23 is necessary for fmemopen
31 lines
687 B
Diff
31 lines
687 B
Diff
--- ../dmsetup.c.orig 2018-12-13 11:29:47.098416214 +0000
|
|
+++ ./libdm/dm-tools/dmsetup.c 2018-12-13 11:47:21.254839518 +0000
|
|
@@ -26,7 +26,9 @@
|
|
#include <ctype.h>
|
|
#include <dirent.h>
|
|
#include <fcntl.h>
|
|
-#include <langinfo.h>
|
|
+#ifndef __ANDROID__
|
|
+# include <langinfo.h>
|
|
+#endif
|
|
#include <locale.h>
|
|
#include <stdlib.h>
|
|
#include <sys/param.h>
|
|
@@ -6463,12 +6465,15 @@
|
|
struct winsize winsz;
|
|
size_t len;
|
|
|
|
+ #ifndef __ANDROID__
|
|
/* Symbol set default */
|
|
if (!strcmp(nl_langinfo(CODESET), "UTF-8"))
|
|
_tsym = &_tsym_utf;
|
|
else
|
|
_tsym = &_tsym_ascii;
|
|
-
|
|
+ #else
|
|
+ _tsym = &_tsym_utf;
|
|
+ #endif
|
|
/* Default */
|
|
_tree_switches[TR_DEVICE] = 1;
|
|
_tree_switches[TR_TRUNCATE] = 1;
|