Solaris: Move shared declarations to xf86_OSlib.h
Gets rid of gcc 4.8 warnings: xf86AutoConfig.c:211:9: warning: nested extern declaration of 'xf86SolarisFbDev' [-Wnested-externs] sun_VTsw.c:44:1: warning: no previous prototype for 'xf86VTRelease' [-Wmissing-prototypes] sun_VTsw.c:59:1: warning: no previous prototype for 'xf86VTAcquire' [-Wmissing-prototypes] and ensures caller & definition stay in sync. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
bebcac0cf7
commit
826e7c2b36
|
@ -208,7 +208,6 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
|
|||
if (xf86Info.consoleFd >= 0 && (i < (nmatches - 1))) {
|
||||
struct vis_identifier visid;
|
||||
const char *cp;
|
||||
extern char xf86SolarisFbDev[PATH_MAX];
|
||||
int iret;
|
||||
|
||||
SYSCALL(iret = ioctl(xf86Info.consoleFd, VIS_GETIDENTIFIER, &visid));
|
||||
|
|
|
@ -52,8 +52,6 @@ static Bool UseConsole = FALSE;
|
|||
static int VTnum = -1;
|
||||
static int xf86StartVT = -1;
|
||||
static int vtEnabled = 0;
|
||||
extern void xf86VTAcquire(int);
|
||||
extern void xf86VTRelease(int);
|
||||
#endif
|
||||
|
||||
/* Device to open as xf86Info.consoleFd */
|
||||
|
|
|
@ -134,10 +134,15 @@
|
|||
#endif
|
||||
#include <sys/kd.h>
|
||||
#include <sys/vt.h>
|
||||
|
||||
extern _X_HIDDEN void xf86VTAcquire(int);
|
||||
extern _X_HIDDEN void xf86VTRelease(int);
|
||||
#endif
|
||||
|
||||
#if defined(sun)
|
||||
#include <sys/fbio.h>
|
||||
extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
|
||||
|
||||
#include <sys/kbd.h>
|
||||
#include <sys/kbio.h>
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user