about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2016-02-26 11:09:16 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2016-02-26 11:09:16 -0300
commitc69c361ca6bf95f8c665884ee863168a321d472a (patch)
tree23d5270a90668070ffb6565fc384b8b0b68541a9 /sysdeps/unix
parent0d210b124d0211717c392dab3208fc49b0bb0ed6 (diff)
parentd5a4840c6b4025302f485b9271e4c72d315221f5 (diff)
downloadglibc-c69c361ca6bf95f8c665884ee863168a321d472a.tar.gz
glibc-c69c361ca6bf95f8c665884ee863168a321d472a.tar.xz
glibc-c69c361ca6bf95f8c665884ee863168a321d472a.zip
Merge branch 'release/2.20/master' into ibm/2.20/master
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/sigaction.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
index 7a0ca7eea2..b1b121d9b7 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
@@ -20,6 +20,8 @@
 # error "Never include <bits/sigaction.h> directly; use <signal.h> instead."
 #endif
 
+#include <bits/wordsize.h>
+
 /* Structure describing the action to be taken when a signal arrives.  */
 struct sigaction
   {
@@ -43,7 +45,9 @@ struct sigaction
     __sigset_t sa_mask;
 
     /* Special flags.  */
+#if __WORDSIZE == 64
     int __glibc_reserved0;
+#endif
     int sa_flags;
 
     /* Not used by Linux/Sparc yet.  */