runtime: rename Sigaltstack to SigaltstackT
Avoids a conflict between the type and function sigaltstack.
LGTM=crawshaw
R=rsc, crawshaw
CC=golang-codereviews
https://golang.org/cl/138920043
diff --git a/src/pkg/runtime/defs1_linux.go b/src/pkg/runtime/defs1_linux.go
index 451817a..392cc4a 100644
--- a/src/pkg/runtime/defs1_linux.go
+++ b/src/pkg/runtime/defs1_linux.go
@@ -31,7 +31,7 @@
type Xmmreg1 C.struct__xmmreg
type Fpstate1 C.struct__fpstate
type Fpreg1 C.struct__fpreg
-type Sigaltstack C.struct_sigaltstack
+type SigaltstackT C.struct_sigaltstack
type Mcontext C.mcontext_t
type Ucontext C.ucontext_t
type Sigcontext C.struct_sigcontext
diff --git a/src/pkg/runtime/defs2_linux.go b/src/pkg/runtime/defs2_linux.go
index 60ecc69..980df9e 100644
--- a/src/pkg/runtime/defs2_linux.go
+++ b/src/pkg/runtime/defs2_linux.go
@@ -139,7 +139,7 @@
type Timeval C.struct_timeval
type Sigaction C.struct_kernel_sigaction
type Siginfo C.siginfo_t
-type Sigaltstack C.struct_sigaltstack
+type SigaltstackT C.struct_sigaltstack
type Sigcontext C.struct_sigcontext
type Ucontext C.struct_ucontext
type Itimerval C.struct_itimerval
diff --git a/src/pkg/runtime/defs_arm_linux.go b/src/pkg/runtime/defs_arm_linux.go
index db0a191..afd6897 100644
--- a/src/pkg/runtime/defs_arm_linux.go
+++ b/src/pkg/runtime/defs_arm_linux.go
@@ -115,7 +115,7 @@
)
type Timespec C.struct_timespec
-type Sigaltstack C.struct_sigaltstack
+type SigaltstackT C.struct_sigaltstack
type Sigcontext C.struct_sigcontext
type Ucontext C.struct_ucontext
type Timeval C.struct_timeval
diff --git a/src/pkg/runtime/defs_dragonfly.go b/src/pkg/runtime/defs_dragonfly.go
index 8ebc3a9..555b8f5 100644
--- a/src/pkg/runtime/defs_dragonfly.go
+++ b/src/pkg/runtime/defs_dragonfly.go
@@ -110,7 +110,7 @@
type Rtprio C.struct_rtprio
type Lwpparams C.struct_lwp_params
-type Sigaltstack C.struct_sigaltstack
+type SigaltstackT C.struct_sigaltstack
type Sigset C.struct___sigset
type StackT C.stack_t
diff --git a/src/pkg/runtime/defs_dragonfly_386.h b/src/pkg/runtime/defs_dragonfly_386.h
index 032b235..f86b9c6 100644
--- a/src/pkg/runtime/defs_dragonfly_386.h
+++ b/src/pkg/runtime/defs_dragonfly_386.h
@@ -85,7 +85,7 @@
typedef struct Rtprio Rtprio;
typedef struct Lwpparams Lwpparams;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
@@ -109,7 +109,7 @@
int32 *tid1;
int32 *tid2;
};
-struct Sigaltstack {
+struct SigaltstackT {
int8 *ss_sp;
uint32 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_dragonfly_amd64.h b/src/pkg/runtime/defs_dragonfly_amd64.h
index c37a72e..6715552 100644
--- a/src/pkg/runtime/defs_dragonfly_amd64.h
+++ b/src/pkg/runtime/defs_dragonfly_amd64.h
@@ -85,7 +85,7 @@
typedef struct Rtprio Rtprio;
typedef struct Lwpparams Lwpparams;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
@@ -109,7 +109,7 @@
int32 *tid1;
int32 *tid2;
};
-struct Sigaltstack {
+struct SigaltstackT {
int8 *ss_sp;
uint64 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_freebsd.go b/src/pkg/runtime/defs_freebsd.go
index 2832583..0253685 100644
--- a/src/pkg/runtime/defs_freebsd.go
+++ b/src/pkg/runtime/defs_freebsd.go
@@ -117,7 +117,7 @@
type Rtprio C.struct_rtprio
type ThrParam C.struct_thr_param
-type Sigaltstack C.struct_sigaltstack
+type SigaltstackT C.struct_sigaltstack
type Sigset C.struct___sigset
type StackT C.stack_t
diff --git a/src/pkg/runtime/defs_freebsd_386.h b/src/pkg/runtime/defs_freebsd_386.h
index e625079..156dccb 100644
--- a/src/pkg/runtime/defs_freebsd_386.h
+++ b/src/pkg/runtime/defs_freebsd_386.h
@@ -89,7 +89,7 @@
typedef struct Rtprio Rtprio;
typedef struct ThrParam ThrParam;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
@@ -119,7 +119,7 @@
Rtprio *rtp;
void *spare[3];
};
-struct Sigaltstack {
+struct SigaltstackT {
int8 *ss_sp;
uint32 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_freebsd_amd64.h b/src/pkg/runtime/defs_freebsd_amd64.h
index 40476f9..4ba8956 100644
--- a/src/pkg/runtime/defs_freebsd_amd64.h
+++ b/src/pkg/runtime/defs_freebsd_amd64.h
@@ -89,7 +89,7 @@
typedef struct Rtprio Rtprio;
typedef struct ThrParam ThrParam;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
@@ -120,7 +120,7 @@
Rtprio *rtp;
void *spare[3];
};
-struct Sigaltstack {
+struct SigaltstackT {
int8 *ss_sp;
uint64 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_freebsd_arm.h b/src/pkg/runtime/defs_freebsd_arm.h
index 927d3a4..17deba6 100644
--- a/src/pkg/runtime/defs_freebsd_arm.h
+++ b/src/pkg/runtime/defs_freebsd_arm.h
@@ -89,7 +89,7 @@
typedef struct Rtprio Rtprio;
typedef struct ThrParam ThrParam;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
@@ -119,7 +119,7 @@
Rtprio *rtp;
void *spare[3];
};
-struct Sigaltstack {
+struct SigaltstackT {
uint8 *ss_sp;
uint32 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_linux_386.h b/src/pkg/runtime/defs_linux_386.h
index 2df3f66..d19bb7a 100644
--- a/src/pkg/runtime/defs_linux_386.h
+++ b/src/pkg/runtime/defs_linux_386.h
@@ -97,7 +97,7 @@
typedef struct Timeval Timeval;
typedef struct SigactionT SigactionT;
typedef struct Siginfo Siginfo;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Ucontext Ucontext;
typedef struct Itimerval Itimerval;
@@ -156,7 +156,7 @@
int32 si_code;
byte _sifields[116];
};
-struct Sigaltstack {
+struct SigaltstackT {
byte *ss_sp;
int32 ss_flags;
uint32 ss_size;
@@ -194,7 +194,7 @@
struct Ucontext {
uint32 uc_flags;
Ucontext *uc_link;
- Sigaltstack uc_stack;
+ SigaltstackT uc_stack;
Sigcontext uc_mcontext;
uint32 uc_sigmask;
};
diff --git a/src/pkg/runtime/defs_linux_amd64.h b/src/pkg/runtime/defs_linux_amd64.h
index 42826c3..73fd994 100644
--- a/src/pkg/runtime/defs_linux_amd64.h
+++ b/src/pkg/runtime/defs_linux_amd64.h
@@ -144,7 +144,7 @@
typedef struct Xmmreg1 Xmmreg1;
typedef struct Fpstate1 Fpstate1;
typedef struct Fpreg1 Fpreg1;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Mcontext Mcontext;
typedef struct Ucontext Ucontext;
typedef struct Sigcontext Sigcontext;
@@ -200,7 +200,7 @@
uint16 significand[4];
uint16 exponent;
};
-struct Sigaltstack {
+struct SigaltstackT {
byte *ss_sp;
int32 ss_flags;
byte Pad_cgo_0[4];
@@ -214,7 +214,7 @@
struct Ucontext {
uint64 uc_flags;
Ucontext *uc_link;
- Sigaltstack uc_stack;
+ SigaltstackT uc_stack;
Mcontext uc_mcontext;
Usigset uc_sigmask;
Fpstate __fpregs_mem;
diff --git a/src/pkg/runtime/defs_linux_arm.h b/src/pkg/runtime/defs_linux_arm.h
index 8c17e38..61bd30d 100644
--- a/src/pkg/runtime/defs_linux_arm.h
+++ b/src/pkg/runtime/defs_linux_arm.h
@@ -88,8 +88,8 @@
int32 tv_nsec;
};
-typedef struct Sigaltstack Sigaltstack;
-struct Sigaltstack {
+typedef struct SigaltstackT SigaltstackT;
+struct SigaltstackT {
void *ss_sp;
int32 ss_flags;
uint32 ss_size;
@@ -124,7 +124,7 @@
struct Ucontext {
uint32 uc_flags;
Ucontext *uc_link;
- Sigaltstack uc_stack;
+ SigaltstackT uc_stack;
Sigcontext uc_mcontext;
uint32 uc_sigmask;
int32 __unused[31];
diff --git a/src/pkg/runtime/defs_netbsd.go b/src/pkg/runtime/defs_netbsd.go
index d1c4cbe..b27949e 100644
--- a/src/pkg/runtime/defs_netbsd.go
+++ b/src/pkg/runtime/defs_netbsd.go
@@ -109,7 +109,7 @@
EVFILT_WRITE = C.EVFILT_WRITE
)
-type Sigaltstack C.struct_sigaltstack
+type SigaltstackT C.struct_sigaltstack
type Sigset C.sigset_t
type Siginfo C.struct__ksiginfo
diff --git a/src/pkg/runtime/defs_netbsd_386.h b/src/pkg/runtime/defs_netbsd_386.h
index fb23611..53d4b30 100644
--- a/src/pkg/runtime/defs_netbsd_386.h
+++ b/src/pkg/runtime/defs_netbsd_386.h
@@ -82,7 +82,7 @@
EVFILT_WRITE = 0x1,
};
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
@@ -95,7 +95,7 @@
#pragma pack on
-struct Sigaltstack {
+struct SigaltstackT {
byte *ss_sp;
uint32 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_netbsd_amd64.h b/src/pkg/runtime/defs_netbsd_amd64.h
index f6ba3db..6227575 100644
--- a/src/pkg/runtime/defs_netbsd_amd64.h
+++ b/src/pkg/runtime/defs_netbsd_amd64.h
@@ -82,7 +82,7 @@
EVFILT_WRITE = 0x1,
};
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
@@ -95,7 +95,7 @@
#pragma pack on
-struct Sigaltstack {
+struct SigaltstackT {
byte *ss_sp;
uint64 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_netbsd_arm.h b/src/pkg/runtime/defs_netbsd_arm.h
index 815d547..115fa43 100644
--- a/src/pkg/runtime/defs_netbsd_arm.h
+++ b/src/pkg/runtime/defs_netbsd_arm.h
@@ -82,7 +82,7 @@
EVFILT_WRITE = 0x1,
};
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
@@ -95,7 +95,7 @@
#pragma pack on
-struct Sigaltstack {
+struct SigaltstackT {
byte *ss_sp;
uint32 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_openbsd.go b/src/pkg/runtime/defs_openbsd.go
index 4a70579..cf4e06d 100644
--- a/src/pkg/runtime/defs_openbsd.go
+++ b/src/pkg/runtime/defs_openbsd.go
@@ -106,7 +106,7 @@
type Tfork C.struct___tfork
-type Sigaltstack C.struct_sigaltstack
+type SigaltstackT C.struct_sigaltstack
type Sigcontext C.struct_sigcontext
type Siginfo C.siginfo_t
type Sigset C.sigset_t
diff --git a/src/pkg/runtime/defs_openbsd_386.h b/src/pkg/runtime/defs_openbsd_386.h
index a63b182..669a35c 100644
--- a/src/pkg/runtime/defs_openbsd_386.h
+++ b/src/pkg/runtime/defs_openbsd_386.h
@@ -82,7 +82,7 @@
};
typedef struct Tfork Tfork;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
@@ -99,7 +99,7 @@
byte *tf_stack;
};
-struct Sigaltstack {
+struct SigaltstackT {
byte *ss_sp;
uint32 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_openbsd_amd64.h b/src/pkg/runtime/defs_openbsd_amd64.h
index 818ac35..9877f8b 100644
--- a/src/pkg/runtime/defs_openbsd_amd64.h
+++ b/src/pkg/runtime/defs_openbsd_amd64.h
@@ -82,7 +82,7 @@
};
typedef struct Tfork Tfork;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigcontext Sigcontext;
typedef struct Siginfo Siginfo;
typedef struct StackT StackT;
@@ -99,7 +99,7 @@
byte *tf_stack;
};
-struct Sigaltstack {
+struct SigaltstackT {
byte *ss_sp;
uint64 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/defs_solaris.go b/src/pkg/runtime/defs_solaris.go
index 8dcbb08..ba44e5f 100644
--- a/src/pkg/runtime/defs_solaris.go
+++ b/src/pkg/runtime/defs_solaris.go
@@ -133,7 +133,7 @@
type SemT C.sem_t
-type Sigaltstack C.struct_sigaltstack
+type SigaltstackT C.struct_sigaltstack
type Sigset C.sigset_t
type StackT C.stack_t
diff --git a/src/pkg/runtime/defs_solaris_amd64.h b/src/pkg/runtime/defs_solaris_amd64.h
index 08727b0..cb1cfea 100644
--- a/src/pkg/runtime/defs_solaris_amd64.h
+++ b/src/pkg/runtime/defs_solaris_amd64.h
@@ -101,7 +101,7 @@
};
typedef struct SemT SemT;
-typedef struct Sigaltstack Sigaltstack;
+typedef struct SigaltstackT SigaltstackT;
typedef struct Sigset Sigset;
typedef struct StackT StackT;
typedef struct Siginfo Siginfo;
@@ -126,7 +126,7 @@
uint64 sem_pad2[2];
};
-struct Sigaltstack {
+struct SigaltstackT {
byte *ss_sp;
uint64 ss_size;
int32 ss_flags;
diff --git a/src/pkg/runtime/os_dragonfly.h b/src/pkg/runtime/os_dragonfly.h
index fddeede..4fb7147 100644
--- a/src/pkg/runtime/os_dragonfly.h
+++ b/src/pkg/runtime/os_dragonfly.h
@@ -8,7 +8,7 @@
int32 runtime·lwp_create(Lwpparams*);
void runtime·sigpanic(void);
-void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
+void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
struct sigaction;
void runtime·sigaction(int32, struct sigaction*, struct sigaction*);
void runtime·sigprocmask(Sigset *, Sigset *);
diff --git a/src/pkg/runtime/os_freebsd.h b/src/pkg/runtime/os_freebsd.h
index 4b2c253..ec0be31 100644
--- a/src/pkg/runtime/os_freebsd.h
+++ b/src/pkg/runtime/os_freebsd.h
@@ -8,7 +8,7 @@
int32 runtime·thr_new(ThrParam*, int32);
void runtime·sigpanic(void);
-void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
+void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
struct sigaction;
void runtime·sigaction(int32, struct sigaction*, struct sigaction*);
void runtime·sigprocmask(Sigset *, Sigset *);
diff --git a/src/pkg/runtime/os_linux.c b/src/pkg/runtime/os_linux.c
index d3677f2..34521cc 100644
--- a/src/pkg/runtime/os_linux.c
+++ b/src/pkg/runtime/os_linux.c
@@ -332,7 +332,7 @@
void
runtime·signalstack(byte *p, int32 n)
{
- Sigaltstack st;
+ SigaltstackT st;
st.ss_sp = p;
st.ss_size = n;
diff --git a/src/pkg/runtime/os_linux.h b/src/pkg/runtime/os_linux.h
index 84f516d..c475d32 100644
--- a/src/pkg/runtime/os_linux.h
+++ b/src/pkg/runtime/os_linux.h
@@ -11,7 +11,7 @@
struct SigactionT;
int32 runtime·rt_sigaction(uintptr, struct SigactionT*, void*, uintptr);
-void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
+void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
void runtime·sigpanic(void);
void runtime·setitimer(int32, Itimerval*, Itimerval*);
diff --git a/src/pkg/runtime/os_netbsd.h b/src/pkg/runtime/os_netbsd.h
index 16e9833..a7995df 100644
--- a/src/pkg/runtime/os_netbsd.h
+++ b/src/pkg/runtime/os_netbsd.h
@@ -16,7 +16,7 @@
void runtime·setitimer(int32, Itimerval*, Itimerval*);
void runtime·sigaction(int32, struct sigaction*, struct sigaction*);
-void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
+void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
void runtime·sigprocmask(int32, Sigset*, Sigset*);
void runtime·unblocksignals(void);
int32 runtime·sysctl(uint32*, uint32, byte*, uintptr*, byte*, uintptr);
diff --git a/src/pkg/runtime/os_openbsd.h b/src/pkg/runtime/os_openbsd.h
index bbfde39..955432e 100644
--- a/src/pkg/runtime/os_openbsd.h
+++ b/src/pkg/runtime/os_openbsd.h
@@ -16,7 +16,7 @@
void runtime·setitimer(int32, Itimerval*, Itimerval*);
void runtime·sigaction(int32, struct sigaction*, struct sigaction*);
-void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
+void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
Sigset runtime·sigprocmask(int32, Sigset);
void runtime·unblocksignals(void);
int32 runtime·sysctl(uint32*, uint32, byte*, uintptr*, byte*, uintptr);
diff --git a/src/pkg/runtime/os_solaris.c b/src/pkg/runtime/os_solaris.c
index 42295aa..d064384 100644
--- a/src/pkg/runtime/os_solaris.c
+++ b/src/pkg/runtime/os_solaris.c
@@ -536,7 +536,7 @@
}
/* int32 */ void
-runtime·sigaltstack(Sigaltstack* ss, Sigaltstack* oss)
+runtime·sigaltstack(SigaltstackT* ss, SigaltstackT* oss)
{
runtime·sysvicall2(libc·sigaltstack, (uintptr)ss, (uintptr)oss);
}
diff --git a/src/pkg/runtime/os_solaris.h b/src/pkg/runtime/os_solaris.h
index 20a0027..ba08771 100644
--- a/src/pkg/runtime/os_solaris.h
+++ b/src/pkg/runtime/os_solaris.h
@@ -16,7 +16,7 @@
void runtime·setitimer(int32, Itimerval*, Itimerval*);
void runtime·sigaction(int32, struct SigactionT*, struct SigactionT*);
-void runtime·sigaltstack(Sigaltstack*, Sigaltstack*);
+void runtime·sigaltstack(SigaltstackT*, SigaltstackT*);
void runtime·sigprocmask(int32, Sigset*, Sigset*);
void runtime·unblocksignals(void);
int32 runtime·sysctl(uint32*, uint32, byte*, uintptr*, byte*, uintptr);
