Comment on kernel stuff

[oweals/busybox.git] / networking / ping.c

diff --git a/networking/ping.c b/networking/ping.c
index 6386c0e42d10262356d7d8193cb94c91096b7a06..c560a7ce2cf457808b8e515019cb81a45b9cb98d 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.17 2000/06/19 18:51:53 andersen Exp $
+ * $Id: ping.c,v 1.19 2000/07/09 06:59:58 andersen Exp $
  * Mini ping implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -51,7 +51,7 @@
 
 /* It turns out that libc5 doesn't have proper icmp support
  * built into it header files, so we have to supplement it */
-#if __GNU_LIBRARY__ < 5
+#if ! defined __GLIBC__ && ! defined __UCLIBC__
 typedef unsigned int socklen_t;
 
 #define        ICMP_MINLEN     8                               /* abs minimum */
@@ -173,7 +173,7 @@ static int in_cksum(unsigned short *buf, int sz)
 }
 
 /* simple version */
-#ifdef BB_SIMPLE_PING
+#ifdef BB_FEATURE_SIMPLE_PING
 static const char *ping_usage = "ping host\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
        "\nSend ICMP ECHO_REQUEST packets to network hosts\n"
@@ -265,7 +265,7 @@ extern int ping_main(int argc, char **argv)
        exit(TRUE);
 }
 
-#else /* ! BB_SIMPLE_PING */
+#else /* ! BB_FEATURE_SIMPLE_PING */
 /* full(er) version */
 static const char *ping_usage = "ping [OPTION]... host\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
@@ -561,7 +561,7 @@ extern int ping_main(int argc, char **argv)
        ping(*argv);
        return(TRUE);
 }
-#endif /* ! BB_SIMPLE_PING */
+#endif /* ! BB_FEATURE_SIMPLE_PING */
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.