Module Name: src
Committed By: christos
Date: Mon Nov 2 00:47:09 UTC 2009
Modified Files:
src/sbin/ping: ping.c
Log Message:
remove ancient ifdefs (Aleksej Saushev)
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sbin/ping/ping.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.89 src/sbin/ping/ping.c:1.90
--- src/sbin/ping/ping.c:1.89 Sat Apr 11 02:49:50 2009
+++ src/sbin/ping/ping.c Sun Nov 1 19:47:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.89 2009/04/11 06:49:50 lukem Exp $ */
+/* $NetBSD: ping.c,v 1.90 2009/11/02 00:47:09 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.89 2009/04/11 06:49:50 lukem Exp $");
+__RCSID("$NetBSD: ping.c,v 1.90 2009/11/02 00:47:09 christos Exp $");
#endif
#include <stdio.h>
@@ -78,18 +78,6 @@
#include <math.h>
#include <string.h>
#include <err.h>
-#ifdef sgi
-#include <bstring.h>
-#include <getopt.h>
-#include <sys/prctl.h>
-#ifndef PRE_KUDZU
-#include <cap_net.h>
-#else
-#define cap_socket socket
-#endif
-#else
-#define cap_socket socket
-#endif
#include <netinet/in_systm.h>
#include <netinet/in.h>
@@ -256,9 +244,9 @@
struct sigaction sa;
#endif
- if ((s = cap_socket(AF_INET, SOCK_RAW, IPPROTO_ICMP)) < 0)
+ if ((s = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP)) < 0)
err(1, "Cannot create socket");
- if ((sloop = cap_socket(AF_INET, SOCK_RAW, IPPROTO_ICMP)) < 0)
+ if ((sloop = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP)) < 0)
err(1, "Cannot create socket");
/*
