Module Name: src
Committed By: christos
Date: Mon Nov 14 16:21:44 UTC 2011
Modified Files:
src/common/lib/libutil: getfstypename.c
Log Message:
compile into nothing if _STANDALONE
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libutil/getfstypename.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libutil/getfstypename.c
diff -u src/common/lib/libutil/getfstypename.c:1.4 src/common/lib/libutil/getfstypename.c:1.5
--- src/common/lib/libutil/getfstypename.c:1.4 Mon Nov 14 09:37:13 2011
+++ src/common/lib/libutil/getfstypename.c Mon Nov 14 11:21:44 2011
@@ -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 $");
-# endif
-#else
-__KERNEL_RCSID(0, "$NetBSD: getfstypename.c,v 1.4 2011/11/14 14:37:13 christos Exp $");
-#endif
+#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>
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-#include <util.h>
-#endif
+# define FSTYPE_ENUMNAME fstype_enum
+# include <sys/types.h>
+# include <sys/disk.h>
+# include <sys/disklabel.h>
+# ifndef _KERNEL
+# include <util.h>
+# endif
const char *
getfstypename(int fstype)
@@ -124,3 +125,4 @@ getfstypename(int fstype)
/* Stupid gcc, should know it is impossible to get here */
return DKW_PTYPE_UNKNOWN;
}
+#endif /* !_STANDALONE */
