diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 15:40:54 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 15:40:54 +0000 |
| commit | 53dc5174789df2f58ccd0df0169c24b4794942df (patch) | |
| tree | 829a4967c4bf69f41ff94353cbd0f0b1b5e73d2c /native_client_sdk | |
| parent | 667229f14115be349b164e2dcf1d9bdebba10a3f (diff) | |
| download | chromium_src-53dc5174789df2f58ccd0df0169c24b4794942df.zip chromium_src-53dc5174789df2f58ccd0df0169c24b4794942df.tar.gz chromium_src-53dc5174789df2f58ccd0df0169c24b4794942df.tar.bz2 | |
[NaCL SDK] nacl_io: add <sys/poll.h>
There are a few headers that are not included in newlib
and/or win32. <poll.h> is one of them but <sys/poll.h>
was not. Some code (specifically civetweb) expected
<sys/poll.h> to exist so this change adds it and makes
poll.h simply include it.
R=binji@chromium.org
Review URL: https://codereview.chromium.org/42343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/build_tools/sdk_files.list | 1 | ||||
| -rw-r--r-- | native_client_sdk/src/libraries/nacl_io/include/poll.h | 5 | ||||
| -rw-r--r-- | native_client_sdk/src/libraries/nacl_io/include/sys/poll.h (renamed from native_client_sdk/src/libraries/nacl_io/poll.h) | 9 | ||||
| -rw-r--r-- | native_client_sdk/src/libraries/nacl_io/library.dsc | 3 |
4 files changed, 13 insertions, 5 deletions
diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list index 5c8c765..8b1ed0f 100644 --- a/native_client_sdk/src/build_tools/sdk_files.list +++ b/native_client_sdk/src/build_tools/sdk_files.list @@ -85,6 +85,7 @@ include/ppapi_simple/* include/sdk_util/* [win]include/win/* include/win/poll.h +include/win/sys/poll.h [linux]lib/${PLATFORM}_host/Debug/libgmock.a [linux]lib/${PLATFORM}_host/Debug/libgtest.a [linux]lib/${PLATFORM}_host/Debug/libjsoncpp.a diff --git a/native_client_sdk/src/libraries/nacl_io/include/poll.h b/native_client_sdk/src/libraries/nacl_io/include/poll.h new file mode 100644 index 0000000..553574d --- /dev/null +++ b/native_client_sdk/src/libraries/nacl_io/include/poll.h @@ -0,0 +1,5 @@ +/* Copyright (c) 2013 The Chromium Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ + +#include <sys/poll.h> diff --git a/native_client_sdk/src/libraries/nacl_io/poll.h b/native_client_sdk/src/libraries/nacl_io/include/sys/poll.h index 842d1ee..1784344 100644 --- a/native_client_sdk/src/libraries/nacl_io/poll.h +++ b/native_client_sdk/src/libraries/nacl_io/include/sys/poll.h @@ -2,8 +2,8 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#ifndef LIBRARIES_NACL_IO_POLL_H_ -#define LIBRARIES_NACL_IO_POLL_H_ +#ifndef LIBRARIES_NACL_IO_INCLUDE_SYS_POLL_H_ +#define LIBRARIES_NACL_IO_INCLUDE_SYS_POLL_H_ #include <stdint.h> @@ -31,9 +31,8 @@ struct pollfd { uint16_t revents; }; -int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout); +int poll(struct pollfd *__fds, nfds_t __nfds, int __timeout); EXTERN_C_END -#endif /* LIBRARIES_NACL_IO_POLL_H_ */ - +#endif /* LIBRARIES_NACL_IO_INCLUDE_SYS_POLL_H_ */ diff --git a/native_client_sdk/src/libraries/nacl_io/library.dsc b/native_client_sdk/src/libraries/nacl_io/library.dsc index 11660d1..53336e8 100644 --- a/native_client_sdk/src/libraries/nacl_io/library.dsc +++ b/native_client_sdk/src/libraries/nacl_io/library.dsc @@ -219,6 +219,7 @@ "poll.h", "sys/ioctl.h", "sys/mount.h", + "sys/poll.h", "sys/select.h", "sys/signal.h", "sys/socket.h", @@ -237,6 +238,7 @@ "poll.h", "sys/ioctl.h", "sys/mount.h", + "sys/poll.h", "sys/select.h", "sys/signal.h", "sys/socket.h", @@ -248,6 +250,7 @@ { 'FILES': [ "poll.h", + "sys/poll.h", ], 'DEST': 'include/win', }, |