Module Name: src
Committed By: pooka
Date: Mon Dec 13 19:19:10 UTC 2010
Modified Files:
src/distrib/utils/x_ping: Makefile
src/distrib/utils/x_route: Makefile
src/sbin/ping: prog_ops.h
src/sbin/route: prog_ops.h
Log Message:
be a happy crunch build
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/x_ping/Makefile
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/x_route/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sbin/ping/prog_ops.h
cvs rdiff -u -r1.1 -r1.2 src/sbin/route/prog_ops.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/x_ping/Makefile
diff -u src/distrib/utils/x_ping/Makefile:1.6 src/distrib/utils/x_ping/Makefile:1.7
--- src/distrib/utils/x_ping/Makefile:1.6 Wed Dec 12 00:05:13 2001
+++ src/distrib/utils/x_ping/Makefile Mon Dec 13 19:19:10 2010
@@ -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
Index: src/distrib/utils/x_route/Makefile
diff -u src/distrib/utils/x_route/Makefile:1.16 src/distrib/utils/x_route/Makefile:1.17
--- src/distrib/utils/x_route/Makefile:1.16 Tue Jan 18 12:30:21 2005
+++ src/distrib/utils/x_route/Makefile Mon Dec 13 19:19:10 2010
@@ -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
Index: src/sbin/ping/prog_ops.h
diff -u src/sbin/ping/prog_ops.h:1.1 src/sbin/ping/prog_ops.h:1.2
--- src/sbin/ping/prog_ops.h:1.1 Mon Dec 13 17:42:17 2010
+++ src/sbin/ping/prog_ops.h Mon Dec 13 19:19:10 2010
@@ -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_ */
Index: src/sbin/route/prog_ops.h
diff -u src/sbin/route/prog_ops.h:1.1 src/sbin/route/prog_ops.h:1.2
--- src/sbin/route/prog_ops.h:1.1 Mon Dec 13 17:39:47 2010
+++ src/sbin/route/prog_ops.h Mon Dec 13 19:19:10 2010
@@ -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_ */
