| author | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-08-05 13:13:56 (GMT) |
|---|---|---|
| committer | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-08-06 11:14:20 (GMT) |
| commit | 9d673761c2dec82482fa5c43ce17aa1f367f250f (patch) | |
| tree | b7dd646f8f33b687503c9d10685575dd256ed969 | |
| parent | 3ae2578282187c775247cb2c3cc9f442d9c138e0 (diff) | |
| download | busybox-9d673761c2dec82482fa5c43ce17aa1f367f250f.zip busybox-9d673761c2dec82482fa5c43ce17aa1f367f250f.tar.gz busybox-9d673761c2dec82482fa5c43ce17aa1f367f250f.tar.bz2 | |
mktemp: warning fix for x86 and l-preview
mktemp is almost not used in busybox, so rename
the function in the mktemp applet to prevent bionic
warning on include.
Change-Id: I4332d3b957aafd6174eb7fe098b099eae779d3c9
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | android/libc/mktemp.c | 2 | ||||
| -rw-r--r-- | debianutils/mktemp.c | 4 | ||||
| -rw-r--r-- | include/android.h | 1 | ||||
| -rw-r--r-- | libbb/platform.c | 3 |
5 files changed, 9 insertions, 3 deletions
@@ -160,7 +160,6 @@ LOCAL_C_INCLUDES := $(bb_gen)/minimal/include $(BUSYBOX_C_INCLUDES) LOCAL_CFLAGS := -Dmain=busybox_driver $(BUSYBOX_CFLAGS) LOCAL_CFLAGS += \ -DRECOVERY_VERSION \ - -Dmktemp=busybox_mktemp \ -Dgetusershell=busybox_getusershell \ -Dsetusershell=busybox_setusershell \ -Dendusershell=busybox_endusershell \ @@ -225,7 +224,6 @@ LOCAL_SRC_FILES := $(BUSYBOX_SRC_FILES) LOCAL_C_INCLUDES := $(bb_gen)/full/include $(BUSYBOX_C_INCLUDES) LOCAL_CFLAGS := $(BUSYBOX_CFLAGS) LOCAL_CFLAGS += \ - -Dmktemp=busybox_mktemp \ -Dgetusershell=busybox_getusershell \ -Dsetusershell=busybox_setusershell \ -Dendusershell=busybox_endusershell \ diff --git a/android/libc/mktemp.c b/android/libc/mktemp.c index 0a06b2d..0b2e933 100644 --- a/android/libc/mktemp.c +++ b/android/libc/mktemp.c @@ -58,7 +58,7 @@ _mktemp(char *path) } char * -mktemp(char *path) +bb_mktemp(char *path) { return (_mktemp(path)); } diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c index 152bd95..602309c 100644 --- a/debianutils/mktemp.c +++ b/debianutils/mktemp.c @@ -53,6 +53,10 @@ #include "libbb.h" +#ifdef __BIONIC__ +#define mktemp(s) bb_mktemp(s) +#endif + int mktemp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int mktemp_main(int argc UNUSED_PARAM, char **argv) { diff --git a/include/android.h b/include/android.h index 0319376..315667a 100644 --- a/include/android.h +++ b/include/android.h @@ -30,6 +30,7 @@ void endutent(void); /* defined in bionic/mktemp.c */ char *mkdtemp(char *); +char *bb_mktemp(char *); /* SYSCALLS */ int stime(time_t *); diff --git a/libbb/platform.c b/libbb/platform.c index 1973451..5fcd448 100644 --- a/libbb/platform.c +++ b/libbb/platform.c @@ -86,6 +86,9 @@ void* FAST_FUNC memrchr(const void *s, int c, size_t n) #endif #ifndef HAVE_MKDTEMP +#ifdef __BIONIC__ +#define mktemp(s) bb_mktemp(s) +#endif /* This is now actually part of POSIX.1, but was only added in 2008 */ char* FAST_FUNC mkdtemp(char *template) { |