diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-08-20 10:54:07 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-08-20 10:54:07 +0100 |
| commit | 9e7b29987fb6370333f4da2d4b91912fd8a29fb9 (patch) | |
| tree | f0ea188ff394fe7f0f7ebdf571594e3e9174d166 /hw/xfree86/common/xf86Priv.h | |
| parent | 2846c3868a71d079c98cf05a9bb750791981f1bf (diff) | |
| parent | bc4cef1d0ae7cbb8f5fe16d576db45abd4330370 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2glucose-2
Conflicts:
configure.ac
glx/glxcmds.c
hw/xfree86/Makefile.am
hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
Diffstat (limited to 'hw/xfree86/common/xf86Priv.h')
| -rw-r--r-- | hw/xfree86/common/xf86Priv.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index cb4bae7cd..159dfb26b 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -52,7 +52,6 @@ extern Bool xf86VidModeDisabled; extern Bool xf86VidModeAllowNonLocal; #endif extern Bool xf86fpFlag; -extern Bool xf86coFlag; extern Bool xf86sFlag; extern Bool xf86bsEnableFlag; extern Bool xf86bsDisableFlag; @@ -70,10 +69,8 @@ extern int xf86Depth; extern Pix24Flags xf86Pix24; extern rgb xf86Weight; extern Bool xf86FlipPixels; -extern Bool xf86BestRefresh; extern Gamma xf86Gamma; extern char *xf86ServerName; -extern Bool xf86ShowUnresolved; extern struct pci_slot_match xf86IsolateDevice; /* Other parameters */ @@ -164,7 +161,6 @@ void xf86SigHandler(int signo); void xf86HandlePMEvents(int fd, pointer data); extern int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num); extern pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event); -void xf86GrabServerCallback(CallbackListPtr *, pointer, pointer); /* xf86Helper.c */ void xf86LogInit(void); |