diff options
| author | Elliott Hughes <enh@google.com> | 2014-03-10 23:25:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-10 23:25:39 +0000 |
| commit | ec674b4d064d923818d0deba9f8378d13ff6451a (patch) | |
| tree | d41780db5bb98c42ecb02267ed18d07ce6876307 /libc | |
| parent | 21d9e58d01080c7494c639ed3bd9e6c805e022d8 (diff) | |
| parent | 57a883640f3b43bf5e332d64489b3eab67a5ac3f (diff) | |
| download | android_bionic-ec674b4d064d923818d0deba9f8378d13ff6451a.tar.gz android_bionic-ec674b4d064d923818d0deba9f8378d13ff6451a.tar.bz2 android_bionic-ec674b4d064d923818d0deba9f8378d13ff6451a.zip | |
Merge "Switch to upstream FreeBSD ldexp.c."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Android.mk | 2 | ||||
| -rw-r--r-- | libc/upstream-freebsd/lib/libc/gen/ldexp.c (renamed from libc/bionic/ldexp.c) | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index efd6d4386..d27d2047f 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -58,7 +58,6 @@ libc_common_src_files := \ bionic/ioctl.c \ bionic/isatty.c \ bionic/issetugid.c \ - bionic/ldexp.c \ bionic/md5.c \ bionic/memmem.c \ bionic/pathconf.c \ @@ -230,6 +229,7 @@ libc_bionic_src_files := \ bionic/wchar.cpp \ libc_upstream_freebsd_src_files := \ + upstream-freebsd/lib/libc/gen/ldexp.c \ upstream-freebsd/lib/libc/gen/sleep.c \ upstream-freebsd/lib/libc/gen/usleep.c \ upstream-freebsd/lib/libc/stdio/fclose.c \ diff --git a/libc/bionic/ldexp.c b/libc/upstream-freebsd/lib/libc/gen/ldexp.c index ec1f3ddda..887f673ee 100644 --- a/libc/bionic/ldexp.c +++ b/libc/upstream-freebsd/lib/libc/gen/ldexp.c @@ -12,9 +12,10 @@ */ #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <endian.h> +#include <machine/endian.h> #include <math.h> /* Bit fiddling routines copied from msun/src/math_private.h,v 1.15 */ |