Index: net.c
===================================================================
RCS file: /cvsroot/strace/strace/net.c,v
retrieving revision 1.20
diff -u -r1.20 net.c
--- net.c	2001/02/21 16:42:26	1.20
+++ net.c	2001/03/01 16:23:39
@@ -219,12 +219,18 @@
 	{ 0,		NULL		},
 };
 static struct xlat socketlayers[] = {
+#if defined(SOL_IP)
 	{ SOL_IP,	"SOL_IP"	},
+#endif
 #if defined(SOL_ICMP)
 	{ SOL_ICMP,	"SOL_ICMP"	},
 #endif
+#if defined(SOL_TCP)
 	{ SOL_TCP,	"SOL_TCP"	},
+#endif
+#if defined(SOL_UDP)
 	{ SOL_UDP,	"SOL_UDP"	},
+#endif
 #if defined(SOL_IPV6)
 	{ SOL_IPV6,	"SOL_IPV6"	},
 #endif
Index: signal.c
===================================================================
RCS file: /cvsroot/strace/strace/signal.c,v
retrieving revision 1.24
diff -u -r1.24 signal.c
--- signal.c	2000/09/01 21:03:06	1.24
+++ signal.c	2001/03/01 16:23:47
@@ -595,8 +595,8 @@
 struct tcb *tcp;
 {
 	long addr;
-	sigset_t sigset;
 #ifdef LINUX
+	sigset_t sigset;
 	struct old_sigaction sa;
 #else
 	struct sigaction sa;