summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:54 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:54 +0000
commit47bee37dc194a4ffec62149bda0434dc19bdea55 (patch)
tree379bcf0597d76969941485a4d7129a6ba98c5a5c
parentf83b90f738f8cece930e20bbfe9507784de2cb92 (diff)
-rw-r--r--constype.c8
-rw-r--r--constype.man5
2 files changed, 10 insertions, 3 deletions
diff --git a/constype.c b/constype.c
index 1136929..756f84a 100644
--- a/constype.c
+++ b/constype.c
@@ -17,6 +17,7 @@
*
* Author: Doug Moran, SRI
*/
+/* $XFree86: xc/programs/Xserver/hw/sun/constype.c,v 3.7 2001/10/28 03:33:10 tsi Exp $ */
/*
SUN-SPOTS DIGEST Thursday, 17 March 1988 Volume 6 : Issue 31
@@ -44,7 +45,11 @@ style.
/* NetBSD seemingly still uses <strings.h> and naturally SunOS does */
#include <strings.h>
#endif
+#include <unistd.h>
+int wu_fbid(char *devname, char **fbname, int *fbtype);
+
+int
main (argc, argv)
int argc;
char **argv;
@@ -146,9 +151,8 @@ int wu_fbid(devname, fbname, fbtype)
return 2;
}
/* FBIOGATTR fails for early frame buffer types */
- if (ioctl_ret = ioctl(fd,FBIOGATTR,&fbattr)) { /*success=>0(false)*/
+ if ((ioctl_ret = ioctl(fd,FBIOGATTR,&fbattr))) /*success=>0(false)*/
ioctl_ret = ioctl(fd, FBIOGTYPE, &fbattr.fbtype);
- }
close(fd);
if ( ioctl_ret == -1 ) {
*fbname = "ioctl on fb failed";
diff --git a/constype.man b/constype.man
index ea7ed19..b09bc32 100644
--- a/constype.man
+++ b/constype.man
@@ -1,5 +1,8 @@
.\" $Xorg: constype.man,v 1.3 2000/08/17 19:48:29 cpqbld Exp $
-.TH CONSTYPE 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/Xserver/hw/sun/constype.man,v 1.6 2001/01/27 18:20:41 dawes Exp $
+.\"
+.TH CONSTYPE 1 __xorgversion__
.SH NAME
constype \- print type of Sun console
.SH SYNOPSIS