diff options
author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-30 01:33:20 -0200 |
---|---|---|
committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-30 01:33:20 -0200 |
commit | fb22d4d928bc5d1a893494a059359da2ed2ac639 (patch) | |
tree | 96e43c78e701d7e44a15ea8538e5bc1e152cc839 /hw/xfree86/common | |
parent | d6cbd4511e35a89a0353f11834c6fdb8d4d2189f (diff) |
Remove declarations of symbols that are never defined.
These symbols were removed from the X Server, or never declared.
One symbol that may need special attention is XkbBuildCoreState(),
that doesn't have a prototype anywhere, but is called from
xkb/xkbEvents.c:XkbFilterEvents(), and also used by the macros
XkbStateFieldFromRec() and XkbGrabStateFromRec() defined in
include/xkbstr.h.
fb/wfbrename.h also may need some cleanup, as it makes several
"renames" of non existing symbols.
Diffstat (limited to 'hw/xfree86/common')
-rw-r--r-- | hw/xfree86/common/xf86.h | 4 | ||||
-rw-r--r-- | hw/xfree86/common/xf86Module.h | 3 | ||||
-rw-r--r-- | hw/xfree86/common/xf86Priv.h | 11 | ||||
-rw-r--r-- | hw/xfree86/common/xf86Xinput.h | 4 |
4 files changed, 0 insertions, 22 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index a32aa9bcc..90e8ff871 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -64,7 +64,6 @@ extern DevPrivateKey xf86CreateRootWindowKey; extern DevPrivateKey xf86PixmapKey; extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */ extern const unsigned char byte_reversed[256]; -extern ScrnInfoPtr xf86CurrentScreen; extern Bool pciSlotClaimed; extern Bool fbSlotClaimed; #if defined(__sparc__) || defined(__sparc) @@ -130,7 +129,6 @@ Bool xf86CheckPciMemBase(struct pci_device * pPci, memType base); void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs, xf86SetAccessFuncPtr oldFuncs); Bool xf86IsEntityPrimary(int entityIndex); -resPtr xf86ReallocatePciResources(int entityIndex, resPtr pRes); resPtr xf86SetOperatingState(resList list, int entityIndex, int mask); void xf86EnterServerState(xf86State state); ScrnInfoPtr xf86FindScreenForEntity(int entityIndex); @@ -277,7 +275,6 @@ void xf86LoaderRefSymLists(const char **, ...); void xf86LoaderRefSymbols(const char *, ...); void xf86SetBackingStore(ScreenPtr pScreen); void xf86SetSilkenMouse(ScreenPtr pScreen); -int xf86NewSerialNumber(WindowPtr p, pointer unused); pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name, char **adaptor_name, pointer *adaptor_options); void xf86GetOS(const char **name, int *major, int *minor, int *teeny); @@ -363,7 +360,6 @@ void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts); /* xf86RandR.c */ #ifdef RANDR Bool xf86RandRInit (ScreenPtr pScreen); -void xf86RandRSetInitialMode (ScreenPtr pScreen); Rotation xf86GetRotation(ScreenPtr pScreen); Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, int newvirtX, int newvirtY, diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 81011e163..f4ce387a4 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -189,9 +189,6 @@ extern ExtensionModule *ExtensionModuleList; pointer LoadSubModule(pointer, const char *, const char **, const char **, pointer, const XF86ModReqInfo *, int *, int *); -pointer LoadSubModuleLocal(pointer, const char *, const char **, - const char **, pointer, const XF86ModReqInfo *, - int *, int *); void UnloadSubModule(pointer); void UnloadModule (pointer); #endif diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 5de48ac77..d2d806f4e 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -61,9 +61,6 @@ extern char *xf86LayoutName; extern char *xf86ScreenName; extern char *xf86PointerName; extern char *xf86KeyboardName; -#ifdef KEEPBPP -extern int xf86Bpp; -#endif extern int xf86FbBpp; extern int xf86Depth; extern Pix24Flags xf86Pix24; @@ -83,11 +80,6 @@ extern const char *xf86LogFile; extern MessageType xf86LogFileFrom; extern Bool xf86LogFileWasOpened; extern serverLayoutRec xf86ConfigLayout; -extern Pix24Flags xf86ConfigPix24; - -extern unsigned short xf86MouseCflags[]; -extern Bool xf86SupportedMouseTypes[]; -extern int xf86NumMouseTypes; extern DriverPtr *xf86DriverList; extern int xf86NumDrivers; @@ -123,13 +115,10 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable; /* xf86Bus.c */ void xf86BusProbe(void); -void xf86ChangeBusIndex(int oldIndex, int newIndex); void xf86AccessInit(void); void xf86AccessEnter(void); void xf86AccessLeave(void); void xf86EntityInit(void); -void xf86EntityEnter(void); -void xf86EntityLeave(void); void xf86AccessLeaveState(void); void xf86FindPrimaryDevice(void); diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index 28a331594..d7f50e082 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -155,7 +155,6 @@ typedef struct _DeviceAssocRec extern InputInfoPtr xf86InputDevs; /* xf86Xinput.c */ -void InitExtInput(void); void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, int first_valuator, int num_valuators, ...); void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute, @@ -171,8 +170,6 @@ void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down, void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down); void xf86ActivateDevice(LocalDevicePtr local); -Bool xf86CheckButton(int button, int down); -void xf86SwitchCoreDevice(LocalDevicePtr device, DeviceIntPtr core); LocalDevicePtr xf86FirstLocalDevice(void); int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow); void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y); @@ -185,7 +182,6 @@ void xf86AddEnabledDevice(InputInfoPtr pInfo); void xf86RemoveEnabledDevice(InputInfoPtr pInfo); void xf86DisableDevice(DeviceIntPtr dev, Bool panic); void xf86EnableDevice(DeviceIntPtr dev); -int xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, BOOL is_auto); /* xf86Helper.c */ void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags); |