summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-03-18 23:27:45 -0400
committerRich Felker <dalias@aerifal.cx>2014-03-18 23:27:45 -0400
commit9505bfbc40fec217820abad7142663eda60cd6be (patch)
tree9079fbd0b02052c8aae1674e213fd9be64ff6284
parent12f37cdee521da18bbc666917f70cefeb29d3db6 (diff)
downloadmusl-9505bfbc40fec217820abad7142663eda60cd6be.tar.gz
musl-9505bfbc40fec217820abad7142663eda60cd6be.tar.bz2
musl-9505bfbc40fec217820abad7142663eda60cd6be.tar.xz
musl-9505bfbc40fec217820abad7142663eda60cd6be.zip
fix signal.h breakage from moving stack_t to arch-specific bits
in the previous changes, I missed the fact that both the prototype of the sigaltstack function and the definition of ucontext_t depend on stack_t.
-rw-r--r--arch/arm/bits/signal.h12
-rw-r--r--arch/i386/bits/signal.h12
-rw-r--r--arch/microblaze/bits/signal.h12
-rw-r--r--arch/mips/bits/signal.h12
-rw-r--r--arch/powerpc/bits/signal.h12
-rw-r--r--arch/sh/bits/signal.h12
-rw-r--r--arch/x32/bits/signal.h12
-rw-r--r--arch/x86_64/bits/signal.h12
-rw-r--r--include/signal.h2
9 files changed, 50 insertions, 48 deletions
diff --git a/arch/arm/bits/signal.h b/arch/arm/bits/signal.h
index 6d91f70f..048635fa 100644
--- a/arch/arm/bits/signal.h
+++ b/arch/arm/bits/signal.h
@@ -18,6 +18,12 @@ typedef struct {
} mcontext_t;
#endif
+struct sigaltstack {
+ void *ss_sp;
+ int ss_flags;
+ size_t ss_size;
+};
+
typedef struct __ucontext {
unsigned long uc_flags;
struct __ucontext *uc_link;
@@ -27,12 +33,6 @@ typedef struct __ucontext {
unsigned long long uc_regspace[64];
} ucontext_t;
-typedef struct sigaltstack {
- void *ss_sp;
- int ss_flags;
- size_t ss_size;
-} stack_t;
-
#define SA_NOCLDSTOP 1
#define SA_NOCLDWAIT 2
#define SA_SIGINFO 4
diff --git a/arch/i386/bits/signal.h b/arch/i386/bits/signal.h
index 7d8d1871..adf0c075 100644
--- a/arch/i386/bits/signal.h
+++ b/arch/i386/bits/signal.h
@@ -53,6 +53,12 @@ typedef struct {
} mcontext_t;
#endif
+struct sigaltstack {
+ void *ss_sp;
+ int ss_flags;
+ size_t ss_size;
+};
+
typedef struct __ucontext {
unsigned long uc_flags;
struct __ucontext *uc_link;
@@ -62,12 +68,6 @@ typedef struct __ucontext {
unsigned long __fpregs_mem[28];
} ucontext_t;
-typedef struct sigaltstack {
- void *ss_sp;
- int ss_flags;
- size_t ss_size;
-} stack_t;
-
#define SA_NOCLDSTOP 1
#define SA_NOCLDWAIT 2
#define SA_SIGINFO 4
diff --git a/arch/microblaze/bits/signal.h b/arch/microblaze/bits/signal.h
index 730ab90b..01fa7bf5 100644
--- a/arch/microblaze/bits/signal.h
+++ b/arch/microblaze/bits/signal.h
@@ -21,6 +21,12 @@ typedef struct {
} mcontext_t;
#endif
+struct sigaltstack {
+ void *ss_sp;
+ int ss_flags;
+ size_t ss_size;
+};
+
typedef struct __ucontext {
unsigned long uc_flags;
struct __ucontext *uc_link;
@@ -29,12 +35,6 @@ typedef struct __ucontext {
sigset_t uc_sigmask;
} ucontext_t;
-typedef struct sigaltstack {
- void *ss_sp;
- int ss_flags;
- size_t ss_size;
-} stack_t;
-
#define SA_NOCLDSTOP 1
#define SA_NOCLDWAIT 2
#define SA_SIGINFO 4
diff --git a/arch/mips/bits/signal.h b/arch/mips/bits/signal.h
index 57336aee..48bd1105 100644
--- a/arch/mips/bits/signal.h
+++ b/arch/mips/bits/signal.h
@@ -38,6 +38,12 @@ typedef struct {
} mcontext_t;
#endif
+struct sigaltstack {
+ void *ss_sp;
+ size_t ss_size;
+ int ss_flags;
+};
+
typedef struct __ucontext {
unsigned long uc_flags;
struct __ucontext *uc_link;
@@ -46,12 +52,6 @@ typedef struct __ucontext {
sigset_t uc_sigmask;
} ucontext_t;
-typedef struct sigaltstack {
- void *ss_sp;
- size_t ss_size;
- int ss_flags;
-} stack_t;
-
#define SA_NOCLDSTOP 1
#define SA_NOCLDWAIT 0x10000
#define SA_SIGINFO 8
diff --git a/arch/powerpc/bits/signal.h b/arch/powerpc/bits/signal.h
index 7113b2ff..3f9f810f 100644
--- a/arch/powerpc/bits/signal.h
+++ b/arch/powerpc/bits/signal.h
@@ -49,6 +49,12 @@ typedef struct {
#endif
+struct sigaltstack {
+ void *ss_sp;
+ int ss_flags;
+ size_t ss_size;
+};
+
typedef struct __ucontext {
unsigned long uc_flags;
struct __ucontext *uc_link;
@@ -60,12 +66,6 @@ typedef struct __ucontext {
mcontext_t uc_mcontext;
} ucontext_t;
-typedef struct sigaltstack {
- void *ss_sp;
- int ss_flags;
- size_t ss_size;
-} stack_t;
-
#define SA_NOCLDSTOP 1U
#define SA_NOCLDWAIT 2U
#define SA_SIGINFO 4U
diff --git a/arch/sh/bits/signal.h b/arch/sh/bits/signal.h
index bb2b9fc5..41b94376 100644
--- a/arch/sh/bits/signal.h
+++ b/arch/sh/bits/signal.h
@@ -19,6 +19,12 @@ typedef struct {
} mcontext_t;
#endif
+struct sigaltstack {
+ void *ss_sp;
+ int ss_flags;
+ size_t ss_size;
+};
+
typedef struct __ucontext {
unsigned long uc_flags;
struct __ucontext *uc_link;
@@ -27,12 +33,6 @@ typedef struct __ucontext {
sigset_t uc_sigmask;
} ucontext_t;
-typedef struct sigaltstack {
- void *ss_sp;
- int ss_flags;
- size_t ss_size;
-} stack_t;
-
#define SA_NOCLDSTOP 1
#define SA_NOCLDWAIT 2
#define SA_SIGINFO 4
diff --git a/arch/x32/bits/signal.h b/arch/x32/bits/signal.h
index 67056c9e..2379f1ca 100644
--- a/arch/x32/bits/signal.h
+++ b/arch/x32/bits/signal.h
@@ -60,6 +60,12 @@ typedef struct {
} mcontext_t;
#endif
+struct sigaltstack {
+ void *ss_sp;
+ int ss_flags;
+ size_t ss_size;
+};
+
typedef struct __ucontext {
unsigned long uc_flags;
struct __ucontext *uc_link;
@@ -69,12 +75,6 @@ typedef struct __ucontext {
unsigned long long __fpregs_mem[64];
} ucontext_t;
-typedef struct sigaltstack {
- void *ss_sp;
- int ss_flags;
- size_t ss_size;
-} stack_t;
-
#define SA_NOCLDSTOP 1
#define SA_NOCLDWAIT 2
#define SA_SIGINFO 4
diff --git a/arch/x86_64/bits/signal.h b/arch/x86_64/bits/signal.h
index 910e4ecb..b3a76165 100644
--- a/arch/x86_64/bits/signal.h
+++ b/arch/x86_64/bits/signal.h
@@ -60,6 +60,12 @@ typedef struct {
} mcontext_t;
#endif
+struct sigaltstack {
+ void *ss_sp;
+ int ss_flags;
+ size_t ss_size;
+};
+
typedef struct __ucontext {
unsigned long uc_flags;
struct __ucontext *uc_link;
@@ -69,12 +75,6 @@ typedef struct __ucontext {
unsigned long __fpregs_mem[64];
} ucontext_t;
-typedef struct sigaltstack {
- void *ss_sp;
- int ss_flags;
- size_t ss_size;
-} stack_t;
-
#define SA_NOCLDSTOP 1
#define SA_NOCLDWAIT 2
#define SA_SIGINFO 4
diff --git a/include/signal.h b/include/signal.h
index ab21e5c0..3fb21b2a 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -77,6 +77,8 @@ extern "C" {
#define CLD_STOPPED 5
#define CLD_CONTINUED 6
+typedef struct sigaltstack stack_t;
+
union sigval {
int sival_int;
void *sival_ptr;