Difference in /usr/include/bits/sigaction.h between i386 and alpha
This is a multipart MIME message.
wmnet is one of my packages. I just included a problem which
solves a rare problem and uploaded it (this is version 1.05-2).
When compiling on my i386/potato system, everything is fine. I
ii libc6-dev 2.1.1-2
After uploading the patched version I got a bug report from
John Goerzen <firstname.lastname@example.org> because he was not able to
compile it on alpha/potato with
ii libc6.1-dev 2.1.1-10
His error message is
imake -DUseInstalled -I/usr/X11R6/lib/X11/config
make: Entering directory `/home/buildd/build/wmnet-1.05'
gcc -Wall -O2 -O2 -I/usr/X11R6/include -Dlinux -DFUNCPROTO=15 -DNARROWPROTO -Dlinux_libc6 -c wmnet.c -o wmnet.o
wmnet.c: In function `setup_wmnet':
wmnet.c:344: structure has no member named `sa_restorer'
make: *** [wmnet.o] Error 1
make: Leaving directory `/home/buildd/build/wmnet-1.05'
make: *** [build-stamp] Error 2
The patch I included did not change wmnet.c. The version 1.05-1
compiled fine on alpha/slink as there is a package in
binary-alpha/x11/wmnet... in slink. The dependecy there says
Depends: libc6.1 (>= 2.0.7u), ...
I looked for the definition of sa_restorer on my system and
found it in one of the include files (which is included by
I downloaded the version 2.1.1-10 of the alpha libc6.1-dev and
made a diff of the two sigaction.h files (see attachment) and it
shows that the alpha version has no sa_restorer defined.
I'm not a programmer, so I don't know if one should not use
this sa_restorer or if the alpha version of sigaction.h is
incomplete. Could you shed some light on this, please?
Philipp Frauenfelder [PGP] mail: email@example.com
Tel./Fax: +41 1 850 54 64 or firstname.lastname@example.org
Proudly running Debian GNU/Linux, see http://www.debian.org/
--- sigaction.h Wed Jun 2 03:32:50 1999
+++ /usr/include/bits/sigaction.h Fri Apr 30 04:29:43 1999
@@ -1,5 +1,5 @@
-/* The proper definitions for Linux/Alpha sigaction.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* The proper definitions for Linux's sigaction.
+ Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -25,32 +25,52 @@
/* Signal handler. */
+ /* Used if SA_SIGINFO is not set. */
+ __sighandler_t sa_handler;
+ /* Used if SA_SIGINFO is set. */
+ void (*sa_sigaction) __PMT ((int, siginfo_t *, void *));
+# define sa_handler __sigaction_handler.sa_handler
+# define sa_sigaction __sigaction_handler.sa_sigaction
/* Additional set of signals to be blocked. */
/* Special flags. */
- unsigned int sa_flags;
+ int sa_flags;
+ /* Restore handler. */
+ void (*sa_restorer) __PMT ((void));
/* Bits in `sa_flags'. */
-#define SA_NOCLDSTOP 0x00000004 /* Don't send SIGCHLD when children stop. */
+#define SA_NOCLDSTOP 1 /* Don't send SIGCHLD when children stop. */
+#define SA_SIGINFO 4 /* Invoke signal-catching function with
+ three arguments instead of one. */
+#if defined __USE_UNIX98 || defined __USE_MISC
+# define SA_ONSTACK 0x08000000 /* Use signal stack by using `sa_restorer'. */
+# define SA_RESTART 0x10000000 /* Restart syscall on signal return. */
+# define SA_NODEFER 0x40000000 /* Don't automatically block the signal when
+ its handler is being executed. */
+# define SA_RESETHAND 0x80000000 /* Reset to SIG_DFL on entry to handler. */
-# define SA_ONSTACK 0x00000001 /* Use signal stack by using `sa_restorer'. */
-# define SA_RESTART 0x00000002 /* Restart syscall on signal return. */
# define SA_INTERRUPT 0x20000000 /* Historical no-op. */
-# define SA_NOMASK 0x00000008 /* Don't automatically block the signal
- when its handler is being executed. */
-# define SA_ONESHOT 0x00000010 /* Reset to SIG_DFL on entry to handler. */
/* Some aliases for the SA_ constants. */
-# define SA_NODEFER SA_NOMASK
-# define SA_RESETHAND SA_ONESHOT
+# define SA_NOMASK SA_NODEFER
+# define SA_ONESHOT SA_RESETHAND
# define SA_STACK SA_ONSTACK
/* Values for the HOW argument to `sigprocmask'. */
-#define SIG_BLOCK 1 /* Block signals. */
-#define SIG_UNBLOCK 2 /* Unblock signals. */
-#define SIG_SETMASK 3 /* Set the set of blocked signals. */
+#define SIG_BLOCK 0 /* Block signals. */
+#define SIG_UNBLOCK 1 /* Unblock signals. */
+#define SIG_SETMASK 2 /* Set the set of blocked signals. */