am 192e169a: Merge "x86 has an assembler bcopy implementation."

* commit '192e169a404fee48483335ed988788924266ff5d':
  x86 has an assembler bcopy implementation.
This commit is contained in:
Elliott Hughes 2015-01-27 05:52:55 +00:00 committed by Android Git Automerger
commit ca3396ef2d

View file

@ -235,11 +235,15 @@ extern "C" sighandler_t bsd_signal(int signum, sighandler_t handler) {
return signal(signum, handler); return signal(signum, handler);
} }
#if !defined(__i386__)
// This was removed from POSIX 2008. // This was removed from POSIX 2008.
#undef bcopy #undef bcopy
extern "C" void bcopy(const void* src, void* dst, size_t n) { extern "C" void bcopy(const void* src, void* dst, size_t n) {
memcpy(dst, src, n); memcpy(dst, src, n);
} }
#else
// x86 has an assembler implementation.
#endif
// sysv_signal() was never in POSIX. // sysv_signal() was never in POSIX.
extern sighandler_t _signal(int signum, sighandler_t handler, int flags); extern sighandler_t _signal(int signum, sighandler_t handler, int flags);