am e611fad0: am 14e1975e: Merge "Fix signalfd for MIPS."

* commit 'e611fad0d055f2d869981136e5e51b7a01d525fc':
  Fix signalfd for MIPS.
This commit is contained in:
Elliott Hughes 2013-01-16 09:48:04 -08:00 committed by Android Git Automerger
commit e05709b1df

View File

@ -25,17 +25,16 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _SYS_SIGNALFD_H_ #ifndef _SYS_SIGNALFD_H_
#define _SYS_SIGNALFD_H_ #define _SYS_SIGNALFD_H_
#include <linux/signalfd.h>
#include <sys/cdefs.h>
#include <signal.h> #include <signal.h>
#include <linux/signalfd.h>
__BEGIN_DECLS __BEGIN_DECLS
/* Compatibility with GLibc */ extern int signalfd(int fd, const sigset_t* mask, int flags) __attribute__((__nonnull__(2)));
extern int signalfd(int fd, const sigset_t *mask, int flags);
__END_DECLS __END_DECLS