[src/trunk]: src be a happy crunch build

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9942a2bcbf5e
branches:  trunk
changeset: 759608:9942a2bcbf5e
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Dec 13 19:19:10 2010 +0000

description:
be a happy crunch build

diffstat:

 distrib/utils/x_ping/Makefile  |   4 ++--
 distrib/utils/x_route/Makefile |   4 ++--
 sbin/ping/prog_ops.h           |  13 ++++++++++++-
 sbin/route/prog_ops.h          |  13 ++++++++++++-
 4 files changed, 28 insertions(+), 6 deletions(-)

diffs (102 lines):

diff -r 7a17a259a3fb -r 9942a2bcbf5e distrib/utils/x_ping/Makefile
--- a/distrib/utils/x_ping/Makefile     Mon Dec 13 19:17:20 2010 +0000
+++ b/distrib/utils/x_ping/Makefile     Mon Dec 13 19:19:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/12/12 00:05:13 tv Exp $
+# $NetBSD: Makefile,v 1.7 2010/12/13 19:19:10 pooka Exp $
 # Build ping without IPSEC
 
 SRCDIR=                ${.CURDIR}/../../../sbin/ping
@@ -6,7 +6,7 @@
 PROG=          ping
 NOMAN=         # defined
 
-CPPFLAGS+=     -I${SRCDIR}
+CPPFLAGS+=     -I${SRCDIR} -DCRUNCHOPS
 DPADD=         ${LIBM}
 LDADD=         -lm
 
diff -r 7a17a259a3fb -r 9942a2bcbf5e distrib/utils/x_route/Makefile
--- a/distrib/utils/x_route/Makefile    Mon Dec 13 19:17:20 2010 +0000
+++ b/distrib/utils/x_route/Makefile    Mon Dec 13 19:19:10 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2005/01/18 12:30:21 lukem Exp $
+#      $NetBSD: Makefile,v 1.17 2010/12/13 19:19:10 pooka Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 SRCDIR=                ${.CURDIR}/../../../sbin/route
@@ -10,7 +10,7 @@
 
 SRCS=          route.c show.c keywords.c
 
-CPPFLAGS+=     -DSMALL -I${SRCDIR}
+CPPFLAGS+=     -DSMALL -I${SRCDIR} -DCRUNCHOPS
 .if defined(SMALLPROG_INET6) && (${USE_INET6} != "no")
 CPPFLAGS+=     -DINET6
 .endif
diff -r 7a17a259a3fb -r 9942a2bcbf5e sbin/ping/prog_ops.h
--- a/sbin/ping/prog_ops.h      Mon Dec 13 19:17:20 2010 +0000
+++ b/sbin/ping/prog_ops.h      Mon Dec 13 19:19:10 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: prog_ops.h,v 1.1 2010/12/13 17:42:17 pooka Exp $      */
+/*      $NetBSD: prog_ops.h,v 1.2 2010/12/13 19:19:10 pooka Exp $      */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,6 +31,7 @@
 
 #include <sys/types.h>
 
+#ifndef CRUNCHOPS
 struct prog_ops {
        int (*op_init)(void);
 
@@ -57,5 +58,15 @@
 #define prog_recvfrom prog_ops.op_recvfrom
 #define prog_sendto prog_ops.op_sendto
 #define prog_close prog_ops.op_close
+#else
+#define prog_init ((int (*)(void))NULL)
+#define prog_socket socket
+#define prog_setsockopt setsockopt
+#define prog_shutdown shutdown
+#define prog_poll poll
+#define prog_recvfrom recvfrom
+#define prog_sendto sendto
+#define prog_close close
+#endif
 
 #endif /* _PROG_OPS_H_ */
diff -r 7a17a259a3fb -r 9942a2bcbf5e sbin/route/prog_ops.h
--- a/sbin/route/prog_ops.h     Mon Dec 13 19:17:20 2010 +0000
+++ b/sbin/route/prog_ops.h     Mon Dec 13 19:19:10 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: prog_ops.h,v 1.1 2010/12/13 17:39:47 pooka Exp $      */
+/*      $NetBSD: prog_ops.h,v 1.2 2010/12/13 19:19:10 pooka Exp $      */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,6 +31,7 @@
 
 #include <sys/types.h>
 
+#ifndef CRUNCHOPS
 struct prog_ops {
        int (*op_init)(void);
 
@@ -56,5 +57,15 @@
 #define prog_write prog_ops.op_write
 #define prog_sysctl prog_ops.op_sysctl
 #define prog_shutdown prog_ops.op_shutdown
+#else
+#define prog_init ((int (*)(void))NULL)
+#define prog_socket socket
+#define prog_open open
+#define prog_getpid getpid
+#define prog_read read
+#define prog_write write
+#define prog_sysctl sysctl
+#define prog_shutdown shutdown
+#endif
 
 #endif /* _PROG_OPS_H_ */