Define prototypes for hw/xfree86/modes/xf86Modes.c only in xf86Modes.h.
This removes a large number of redundant declaration warnings. Signed-off-by: Jeremy White <jwhite@codeweavers.com> Reviewed-by: Robert Morell <rmorell@nvidia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
e13f299842
commit
ecf6275508
|
@ -198,11 +198,6 @@ extern _X_EXPORT void *xf86GetPointerScreenFuncs(void);
|
||||||
extern _X_EXPORT void xf86InitOrigins(void);
|
extern _X_EXPORT void xf86InitOrigins(void);
|
||||||
extern _X_EXPORT void xf86ReconfigureLayout(void);
|
extern _X_EXPORT void xf86ReconfigureLayout(void);
|
||||||
|
|
||||||
/* xf86cvt.c */
|
|
||||||
extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay,
|
|
||||||
float VRefresh, Bool Reduced,
|
|
||||||
Bool Interlaced);
|
|
||||||
|
|
||||||
/* xf86DPMS.c */
|
/* xf86DPMS.c */
|
||||||
|
|
||||||
extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set,
|
extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set,
|
||||||
|
@ -413,26 +408,6 @@ extern _X_EXPORT void
|
||||||
xf86PrintModes(ScrnInfoPtr scrp);
|
xf86PrintModes(ScrnInfoPtr scrp);
|
||||||
extern _X_EXPORT void
|
extern _X_EXPORT void
|
||||||
xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges);
|
xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges);
|
||||||
extern _X_EXPORT double
|
|
||||||
xf86ModeHSync(const DisplayModeRec * mode);
|
|
||||||
extern _X_EXPORT double
|
|
||||||
xf86ModeVRefresh(const DisplayModeRec * mode);
|
|
||||||
extern _X_EXPORT void
|
|
||||||
xf86SetModeDefaultName(DisplayModePtr mode);
|
|
||||||
extern _X_EXPORT void
|
|
||||||
xf86SetModeCrtc(DisplayModePtr p, int adjustFlags);
|
|
||||||
extern _X_EXPORT DisplayModePtr
|
|
||||||
xf86DuplicateMode(const DisplayModeRec * pMode);
|
|
||||||
extern _X_EXPORT void
|
|
||||||
xf86SaveModeContents(DisplayModePtr intern, const DisplayModeRec * pMode);
|
|
||||||
extern _X_EXPORT DisplayModePtr
|
|
||||||
xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList);
|
|
||||||
extern _X_EXPORT Bool
|
|
||||||
xf86ModesEqual(const DisplayModeRec * pMode1, const DisplayModeRec * pMode2);
|
|
||||||
extern _X_EXPORT void
|
|
||||||
xf86PrintModeline(int scrnIndex, DisplayModePtr mode);
|
|
||||||
extern _X_EXPORT DisplayModePtr
|
|
||||||
xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new);
|
|
||||||
|
|
||||||
/* xf86Option.c */
|
/* xf86Option.c */
|
||||||
|
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "xf86.h"
|
#include "xf86.h"
|
||||||
|
#include "xf86Modes.h"
|
||||||
#include "xf86Parser.h"
|
#include "xf86Parser.h"
|
||||||
#include "xf86tokens.h"
|
#include "xf86tokens.h"
|
||||||
#include "xf86Config.h"
|
#include "xf86Config.h"
|
||||||
|
|
|
@ -45,8 +45,6 @@ extern _X_EXPORT void
|
||||||
|
|
||||||
extern _X_EXPORT Bool xf86SetDDCproperties(ScrnInfoPtr pScreen, xf86MonPtr DDC);
|
extern _X_EXPORT Bool xf86SetDDCproperties(ScrnInfoPtr pScreen, xf86MonPtr DDC);
|
||||||
|
|
||||||
extern _X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC);
|
|
||||||
|
|
||||||
extern _X_EXPORT Bool
|
extern _X_EXPORT Bool
|
||||||
xf86MonitorIsHDMI(xf86MonPtr mon);
|
xf86MonitorIsHDMI(xf86MonPtr mon);
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ else
|
||||||
libfbdevhw_la_SOURCES = fbdevhwstub.c
|
libfbdevhw_la_SOURCES = fbdevhwstub.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
|
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c -I$(srcdir)/../modes -I$(srcdir)/../ddc -I$(srcdir)/../parser
|
||||||
|
|
||||||
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "xf86.h"
|
#include "xf86.h"
|
||||||
|
#include "xf86Modes.h"
|
||||||
#include "xf86_OSproc.h"
|
#include "xf86_OSproc.h"
|
||||||
|
|
||||||
/* pci stuff */
|
/* pci stuff */
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#include "xorg-config.h"
|
#include "xorg-config.h"
|
||||||
#include "xf86.h"
|
#include "xf86.h"
|
||||||
|
#include "xf86Modes.h"
|
||||||
#include "xf86str.h"
|
#include "xf86str.h"
|
||||||
#include "edid.h"
|
#include "edid.h"
|
||||||
#include "xf86DDC.h"
|
#include "xf86DDC.h"
|
||||||
|
|
|
@ -111,6 +111,9 @@ xf86GetMonitorModes(ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor);
|
||||||
|
|
||||||
extern _X_EXPORT DisplayModePtr xf86GetDefaultModes(void);
|
extern _X_EXPORT DisplayModePtr xf86GetDefaultModes(void);
|
||||||
|
|
||||||
|
extern _X_EXPORT void
|
||||||
|
xf86SaveModeContents(DisplayModePtr intern, const DisplayModeRec *mode);
|
||||||
|
|
||||||
extern _X_EXPORT void
|
extern _X_EXPORT void
|
||||||
xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC);
|
xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC);
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include "xf86.h"
|
#include "xf86.h"
|
||||||
#include "os.h"
|
#include "os.h"
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
#include "xf86Modes.h"
|
||||||
#include "xf86Priv.h"
|
#include "xf86Priv.h"
|
||||||
#include "xf86DDC.h"
|
#include "xf86DDC.h"
|
||||||
#include "mipointer.h"
|
#include "mipointer.h"
|
||||||
|
|
|
@ -24,6 +24,7 @@ bin_PROGRAMS = cvt
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS) \
|
INCLUDES = $(XORG_INCS) \
|
||||||
-I$(top_srcdir)/hw/xfree86/ddc \
|
-I$(top_srcdir)/hw/xfree86/ddc \
|
||||||
|
-I$(top_srcdir)/hw/xfree86/modes \
|
||||||
-I$(top_srcdir)/hw/xfree86/parser
|
-I$(top_srcdir)/hw/xfree86/parser
|
||||||
|
|
||||||
# gah
|
# gah
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
/* Standalone VESA CVT standard timing modelines generator. */
|
/* Standalone VESA CVT standard timing modelines generator. */
|
||||||
|
|
||||||
#include "xf86.h"
|
#include "xf86.h"
|
||||||
|
#include "xf86Modes.h"
|
||||||
|
|
||||||
/* FatalError implementation used by the server code we built in */
|
/* FatalError implementation used by the server code we built in */
|
||||||
void
|
void
|
||||||
|
|
|
@ -10,4 +10,5 @@ sdk_HEADERS = vbe.h vbeModes.h
|
||||||
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
|
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
|
||||||
|
-I$(srcdir)/../modes -I$(srcdir)/../parser \
|
||||||
-I$(srcdir)/../int10
|
-I$(srcdir)/../int10
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "xf86.h"
|
#include "xf86.h"
|
||||||
|
#include "xf86Modes.h"
|
||||||
#include "vbe.h"
|
#include "vbe.h"
|
||||||
#include <X11/extensions/dpmsconst.h>
|
#include <X11/extensions/dpmsconst.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user