Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/common/lib/libutil compile into nothing if _STANDALONE



details:   https://anonhg.NetBSD.org/src/rev/b39ddf160154
branches:  trunk
changeset: 771215:b39ddf160154
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 14 16:21:44 2011 +0000

description:
compile into nothing if _STANDALONE

diffstat:

 common/lib/libutil/getfstypename.c |  34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diffs (53 lines):

diff -r d413f403acd4 -r b39ddf160154 common/lib/libutil/getfstypename.c
--- a/common/lib/libutil/getfstypename.c        Mon Nov 14 16:04:29 2011 +0000
+++ b/common/lib/libutil/getfstypename.c        Mon Nov 14 16:21:44 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getfstypename.c,v 1.4 2011/11/14 14:37:13 christos Exp $       */
+/*     $NetBSD: getfstypename.c,v 1.5 2011/11/14 16:21:44 christos Exp $       */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -35,22 +35,23 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#include <sys/cdefs.h>
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-# if !defined(lint)
-__RCSID("$NetBSD: getfstypename.c,v 1.4 2011/11/14 14:37:13 christos Exp $");
+#ifndef _STANDALONE
+# include <sys/cdefs.h>
+# ifndef _KERNEL
+#  if !defined(lint)
+__RCSID("$NetBSD: getfstypename.c,v 1.5 2011/11/14 16:21:44 christos Exp $");
+#  endif
+# else
+__KERNEL_RCSID(0, "$NetBSD: getfstypename.c,v 1.5 2011/11/14 16:21:44 christos Exp $");
+# endif /* _KERNEL */
+
+# define FSTYPE_ENUMNAME fstype_enum
+# include <sys/types.h>
+# include <sys/disk.h>
+# include <sys/disklabel.h>
+# ifndef _KERNEL
+#  include <util.h>
 # endif
-#else
-__KERNEL_RCSID(0, "$NetBSD: getfstypename.c,v 1.4 2011/11/14 14:37:13 christos Exp $");
-#endif
-
-#define FSTYPE_ENUMNAME fstype_enum
-#include <sys/types.h>
-#include <sys/disk.h>
-#include <sys/disklabel.h>
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <util.h>
-#endif
 
 const char *
 getfstypename(int fstype)
@@ -124,3 +125,4 @@
        /* Stupid gcc, should know it is impossible to get here */
        return DKW_PTYPE_UNKNOWN;
 }
+#endif /* !_STANDALONE */



Home | Main Index | Thread Index | Old Index