diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2014-12-17 20:50:02 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-12-19 18:16:19 -0800 |
| commit | 826e7c2b36f192fbbe7ddff37eb559f4d6301146 (patch) | |
| tree | 86da14c18573d3933ec412f4134a92d35a04b8b5 | |
| parent | bebcac0cf790b220e849e8905139d0744a606928 (diff) | |
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>
| -rw-r--r-- | hw/xfree86/common/xf86AutoConfig.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/solaris/sun_init.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/xf86_OSlib.h | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 03dad150a..1450afbfc 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -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)); diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index 2e0af2246..cc50f36c4 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -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 */ diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 3a83f348f..6190fe6a0 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -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> |