Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/wscons Untangle.



details:   https://anonhg.NetBSD.org/src/rev/e45434c6dcc9
branches:  trunk
changeset: 341493:e45434c6dcc9
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 08 16:49:41 2015 +0000

description:
Untangle.

diffstat:

 sys/dev/wscons/wsemul_sun.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 63264b366d51 -r e45434c6dcc9 sys/dev/wscons/wsemul_sun.c
--- a/sys/dev/wscons/wsemul_sun.c       Sun Nov 08 16:49:20 2015 +0000
+++ b/sys/dev/wscons/wsemul_sun.c       Sun Nov 08 16:49:41 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_sun.c,v 1.28 2010/03/12 08:40:50 jdc Exp $ */
+/* $NetBSD: wsemul_sun.c,v 1.29 2015/11/08 16:49:41 christos Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -33,7 +33,7 @@
 /* XXX DESCRIPTION/SOURCE OF INFORMATION */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.28 2010/03/12 08:40:50 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.29 2015/11/08 16:49:41 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -151,11 +151,11 @@
                res = (*edp->emulops->allocattr)(cookie, 0, 0,
                                            WS_KERNEL_MONOATTR,
                                            &edp->kernattr);
+#else
+       res = EINVAL;
+#endif
        if (res)
-#else
-       res = 0; /* XXX gcc */
-#endif
-       edp->kernattr = defattr;
+               edp->kernattr = defattr;
 
        edp->cbcookie = NULL;
 



Home | Main Index | Thread Index | Old Index