repo sync 686af0b3a5 resolved conflicts for merge of defd1622 to gingerbread-plus-aosp ...

Conflicts:
	libc/arch-arm/syscalls/eventfd.S
	libc/include/sys/eventfd.h
	libc/include/sys/linux-syscalls.h

Change-Id: I02f6e9536aa5478322240c199ff4c2f4367922d0

2010-09-28 12:23:55 +02:00

..

_errdefs.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

_sigdefs.h

Add the BSD sys_signame array.

2009-11-05 15:50:05 -08:00

_system_properties.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

_types.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

atomics.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

cdefs_elf.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

cdefs.h

Remove compiler warnings when building Bionic.

2010-06-22 17:51:41 -07:00

dirent.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

endian.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

epoll.h

Fix <sys/epoll.h> and <sys/system_properties.h> to include proper C++ inclusion guards

2010-02-09 14:05:43 -08:00

errno.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

eventfd.h

libc: add <sys/eventfd.h> and corresponding implementations.

2010-09-28 09:20:37 +02:00

exec_elf.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

file.h

libc: remove C++ comments from public headers.

2010-09-27 17:35:26 +02:00

fsuid.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

inotify.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

ioctl_compat.h

libc: remove C++ comments from public headers.

2010-09-27 17:35:26 +02:00

ioctl.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

ipc.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

klog.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

limits.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

linux-syscalls.h

libc: add <sys/eventfd.h> and corresponding implementations.

2010-09-28 09:20:37 +02:00

linux-unistd.h

resolved conflicts for merge of defd1622 to gingerbread-plus-aosp

2010-09-28 12:23:55 +02:00

mman.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

mount.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

param.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

poll.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

prctl.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

ptrace.h

libc: remove C++ comments from public headers.

2010-09-27 17:35:26 +02:00

queue.h

Add fts, err, and sys/queue for grep

2010-01-15 15:57:02 -08:00

reboot.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

resource.h

Add definition of rlim_t

2010-01-15 15:57:02 -08:00

select.h

Remove compiler warnings when building Bionic.

2010-06-22 17:51:41 -07:00

sendfile.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

socket.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

socketcalls.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

stat.h

Add Glibc-compatible macro aliases for the nanosecond time accessors in stat structure

2009-06-22 12:16:06 +02:00

statfs.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

syscall.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

sysconf.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

sysinfo.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

syslimits.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

sysmacros.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

system_properties.h

Fix <sys/epoll.h> and <sys/system_properties.h> to include proper C++ inclusion guards

2010-02-09 14:05:43 -08:00

time.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

timeb.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

times.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

ttychars.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

ttydev.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

types.h

Remove compiler warnings when building Bionic.

2010-06-22 17:51:41 -07:00

uio.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

un.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

utime.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

utsname.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

vfs.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

vt.h

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

wait.h

libc: Add missing waitid() implementation.

2010-09-28 09:18:26 +02:00