Module Name: src
Committed By: pooka
Date: Mon Dec 13 21:48:01 UTC 2010
Modified Files:
src/sbin/ifconfig: prog_ops.h
src/sbin/modload: prog_ops.h
src/sbin/modstat: prog_ops.h
src/sbin/modunload: prog_ops.h
src/sbin/sysctl: prog_ops.h
Log Message:
use crunchops for crunchables
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/ifconfig/prog_ops.h
cvs rdiff -u -r1.1 -r1.2 src/sbin/modload/prog_ops.h
cvs rdiff -u -r1.1 -r1.2 src/sbin/modstat/prog_ops.h
cvs rdiff -u -r1.1 -r1.2 src/sbin/modunload/prog_ops.h
cvs rdiff -u -r1.1 -r1.2 src/sbin/sysctl/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/sbin/ifconfig/prog_ops.h
diff -u src/sbin/ifconfig/prog_ops.h:1.2 src/sbin/ifconfig/prog_ops.h:1.3
--- src/sbin/ifconfig/prog_ops.h:1.2 Mon Dec 13 19:17:20 2010
+++ src/sbin/ifconfig/prog_ops.h Mon Dec 13 21:48:01 2010
@@ -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);
Index: src/sbin/modload/prog_ops.h
diff -u src/sbin/modload/prog_ops.h:1.1 src/sbin/modload/prog_ops.h:1.2
--- src/sbin/modload/prog_ops.h:1.1 Mon Dec 13 20:48:44 2010
+++ src/sbin/modload/prog_ops.h Mon Dec 13 21:48:01 2010
@@ -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_ */
Index: src/sbin/modstat/prog_ops.h
diff -u src/sbin/modstat/prog_ops.h:1.1 src/sbin/modstat/prog_ops.h:1.2
--- src/sbin/modstat/prog_ops.h:1.1 Mon Dec 13 20:48:45 2010
+++ src/sbin/modstat/prog_ops.h Mon Dec 13 21:48:01 2010
@@ -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_ */
Index: src/sbin/modunload/prog_ops.h
diff -u src/sbin/modunload/prog_ops.h:1.1 src/sbin/modunload/prog_ops.h:1.2
--- src/sbin/modunload/prog_ops.h:1.1 Mon Dec 13 20:48:45 2010
+++ src/sbin/modunload/prog_ops.h Mon Dec 13 21:48:01 2010
@@ -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_ */
Index: src/sbin/sysctl/prog_ops.h
diff -u src/sbin/sysctl/prog_ops.h:1.1 src/sbin/sysctl/prog_ops.h:1.2
--- src/sbin/sysctl/prog_ops.h:1.1 Mon Dec 13 17:47:40 2010
+++ src/sbin/sysctl/prog_ops.h Mon Dec 13 21:48:01 2010
@@ -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_ */
