commit e611fad0d055f2d869981136e5e51b7a01d525fc
author Elliott Hughes <enh@google.com> Wed Jan 16 09:45:57 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 16 09:45:57 2013 -0800
tree f2f46fb60e19e36e5fd1bc862325b1a9141e16dc
parent 42c5847d65d3e50a3efc4e32bb913dc66c9d0e4d
parent 14e1975e13c197180ed0481f305f83a362b16a24

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

* commit '14e1975e13c197180ed0481f305f83a362b16a24':
  Fix signalfd for MIPS.

libc/include/sys/signalfd.h

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