Source-Changes-HG archive

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

[src/trunk]: src/sys/dev On LP64 host, fss_get and fss_get50 have the same si...



details:   https://anonhg.NetBSD.org/src/rev/4ee775abe159
branches:  trunk
changeset: 771710:4ee775abe159
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Nov 30 09:51:18 2011 +0000

description:
On LP64 host, fss_get and fss_get50 have the same size; so FSSIOCGET50
and FSSIOCGET are identical and the compiler complains about
"duplicate case value". Guard FSSIOCGET50 with #ifndef _LP64/#endif to
fix this.

diffstat:

 sys/dev/fss.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r 7c7a1ee66f3c -r 4ee775abe159 sys/dev/fss.c
--- a/sys/dev/fss.c     Tue Nov 29 21:48:22 2011 +0000
+++ b/sys/dev/fss.c     Wed Nov 30 09:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fss.c,v 1.80 2011/11/29 20:56:12 bouyer Exp $  */
+/*     $NetBSD: fss.c,v 1.81 2011/11/30 09:51:18 bouyer Exp $  */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.80 2011/11/29 20:56:12 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.81 2011/11/30 09:51:18 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -304,7 +304,9 @@
        struct fss_set *fss = (struct fss_set *)data;
        struct fss_set50 *fss50 = (struct fss_set50 *)data;
        struct fss_get *fsg = (struct fss_get *)data;
+#ifndef _LP64
        struct fss_get50 *fsg50 = (struct fss_get50 *)data;
+#endif
 
        switch (cmd) {
        case FSSIOCSET50:
@@ -338,6 +340,7 @@
                mutex_exit(&sc->sc_lock);
                break;
 
+#ifndef _LP64
        case FSSIOCGET50:
                mutex_enter(&sc->sc_lock);
                switch (sc->sc_flags & (FSS_PERSISTENT | FSS_ACTIVE)) {
@@ -363,6 +366,7 @@
                }
                mutex_exit(&sc->sc_lock);
                break;
+#endif /* _LP64 */
 
        case FSSIOCGET:
                mutex_enter(&sc->sc_lock);



Home | Main Index | Thread Index | Old Index