frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix up EnableDisableExtension() and EnableDisableExtensionError() prototypes

This commit is contained in:
Greg Kroah-Hartman 2006-06-08 10:27:28 -07:00
parent c405659626
commit 9fa73721f0
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86Config.c
View File

@ -67,6 +67,7 @@
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#include "globals.h" #include "globals.h"
#include "extension.h"
#ifdef XINPUT #ifdef XINPUT
#include "xf86Xinput.h" #include "xf86Xinput.h"
@ -2524,9 +2525,6 @@ configDRI(XF86ConfDRIPtr drip)
} }
#endif #endif
/* Extension enable/disable in miinitext.c */
extern Bool EnableDisableExtension(char *name, Bool enable);
static Bool static Bool
configExtensions(XF86ConfExtensionsPtr conf_ext) configExtensions(XF86ConfExtensionsPtr conf_ext)
{ {

4
include/extension.h
View File

@ -56,6 +56,10 @@ extern unsigned short StandardMinorOpcode(ClientPtr /*client*/);
extern unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); extern unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
extern Bool EnableDisableExtension(char *name, Bool enable);
extern void EnableDisableExtensionError(char *name, Bool enable);
extern void InitExtensions(int argc, char **argv); extern void InitExtensions(int argc, char **argv);
extern void InitVisualWrap(void); extern void InitVisualWrap(void);

5
os/utils.c
View File

@ -72,6 +72,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include "input.h" #include "input.h"
#include "dixfont.h" #include "dixfont.h"
#include "osdep.h" #include "osdep.h"
#include "extension.h"
#ifdef X_POSIX_C_SOURCE #ifdef X_POSIX_C_SOURCE
#define _POSIX_C_SOURCE X_POSIX_C_SOURCE #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
#include <signal.h> #include <signal.h>
@ -287,10 +288,6 @@ int userdefinedfontpath = 0;
char *dev_tty_from_init = NULL; /* since we need to parse it anyway */ char *dev_tty_from_init = NULL; /* since we need to parse it anyway */
/* Extension enable/disable in miinitext.c */
extern Bool EnableDisableExtension(char *name, Bool enable);
extern void EnableDisableExtensionError(char *name, Bool enable);
OsSigHandlerPtr OsSigHandlerPtr
OsSignal(sig, handler) OsSignal(sig, handler)
int sig; int sig;