[src/trunk]: src/sbin use crunchops for crunchables

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

details:   https://anonhg.NetBSD.org/src/rev/07addf7f1bef
branches:  trunk
changeset: 759621:07addf7f1bef
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Dec 13 21:48:01 2010 +0000

description:
use crunchops for crunchables

diffstat:

 sbin/ifconfig/prog_ops.h  |  4 ++--
 sbin/modload/prog_ops.h   |  7 ++++++-
 sbin/modstat/prog_ops.h   |  7 ++++++-
 sbin/modunload/prog_ops.h |  7 ++++++-
 sbin/sysctl/prog_ops.h    |  7 ++++++-
 5 files changed, 26 insertions(+), 6 deletions(-)

diffs (126 lines):

diff -r c5124fa7df8c -r 07addf7f1bef sbin/ifconfig/prog_ops.h
--- a/sbin/ifconfig/prog_ops.h  Mon Dec 13 21:47:32 2010 +0000
+++ b/sbin/ifconfig/prog_ops.h  Mon Dec 13 21:48:01 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: prog_ops.h,v 1.2 2010/12/13 19:17:20 njoly Exp $      */
+/*      $NetBSD: prog_ops.h,v 1.3 2010/12/13 21:48:01 pooka Exp $      */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 
 /* ifconfig is compiled outside of src/sbin/ifconfig too */
-#ifdef RUMP_ACTION
+#ifndef CRUNCHOPS
 struct prog_ops {
        int (*op_init)(void);
 
diff -r c5124fa7df8c -r 07addf7f1bef sbin/modload/prog_ops.h
--- a/sbin/modload/prog_ops.h   Mon Dec 13 21:47:32 2010 +0000
+++ b/sbin/modload/prog_ops.h   Mon Dec 13 21:48:01 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: prog_ops.h,v 1.1 2010/12/13 20:48:44 pooka Exp $      */
+/*      $NetBSD: prog_ops.h,v 1.2 2010/12/13 21:48:01 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);
 
@@ -40,5 +41,9 @@
 
 #define prog_init prog_ops.op_init
 #define prog_modctl prog_ops.op_modctl
+#else
+#define prog_init ((int (*)(void))NULL)
+#define prog_modctl modctl
+#endif
 
 #endif /* _PROG_OPS_H_ */
diff -r c5124fa7df8c -r 07addf7f1bef sbin/modstat/prog_ops.h
--- a/sbin/modstat/prog_ops.h   Mon Dec 13 21:47:32 2010 +0000
+++ b/sbin/modstat/prog_ops.h   Mon Dec 13 21:48:01 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: prog_ops.h,v 1.1 2010/12/13 20:48:45 pooka Exp $      */
+/*      $NetBSD: prog_ops.h,v 1.2 2010/12/13 21:48:01 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);
 
@@ -40,5 +41,9 @@
 
 #define prog_init prog_ops.op_init
 #define prog_modctl prog_ops.op_modctl
+#else
+#define prog_init ((int (*)(void))NULL)
+#define prog_modctl modctl
+#endif
 
 #endif /* _PROG_OPS_H_ */
diff -r c5124fa7df8c -r 07addf7f1bef sbin/modunload/prog_ops.h
--- a/sbin/modunload/prog_ops.h Mon Dec 13 21:47:32 2010 +0000
+++ b/sbin/modunload/prog_ops.h Mon Dec 13 21:48:01 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: prog_ops.h,v 1.1 2010/12/13 20:48:45 pooka Exp $      */
+/*      $NetBSD: prog_ops.h,v 1.2 2010/12/13 21:48:01 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);
 
@@ -40,5 +41,9 @@
 
 #define prog_init prog_ops.op_init
 #define prog_modctl prog_ops.op_modctl
+#else
+#define prog_init ((int (*)(void))NULL)
+#define prog_modctl modctl
+#endif
 
 #endif /* _PROG_OPS_H_ */
diff -r c5124fa7df8c -r 07addf7f1bef sbin/sysctl/prog_ops.h
--- a/sbin/sysctl/prog_ops.h    Mon Dec 13 21:47:32 2010 +0000
+++ b/sbin/sysctl/prog_ops.h    Mon Dec 13 21:48:01 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: prog_ops.h,v 1.1 2010/12/13 17:47:40 pooka Exp $      */
+/*      $NetBSD: prog_ops.h,v 1.2 2010/12/13 21:48:01 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);
 
@@ -41,5 +42,9 @@
 
 #define prog_init prog_ops.op_init
 #define prog_sysctl prog_ops.op_sysctl
+#else
+#define prog_init ((int (*)(void))NULL)
+#define prog_sysctl sysctl
+#endif
 
 #endif /* _PROG_OPS_H_ */