diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-27 08:37:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-27 08:37:02 +0200 |
| commit | 2233c44285f7e820f04abd07d6cf5eedbe32b8a3 (patch) | |
| tree | 80d64c8daf68c57aaf3b6937cbd075161deaa3d2 /xorg-server/hw/xfree86/common/xf86.h | |
| parent | 95acf9816e008fa46a6c2fa2f35500deb358bb69 (diff) | |
| parent | 183b7373f9919eeb5eb408f38578e01717b2cc10 (diff) | |
| download | vcxsrv-2233c44285f7e820f04abd07d6cf5eedbe32b8a3.tar.gz vcxsrv-2233c44285f7e820f04abd07d6cf5eedbe32b8a3.tar.bz2 vcxsrv-2233c44285f7e820f04abd07d6cf5eedbe32b8a3.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/version.c
xorg-server/include/globals.h
xorg-server/mi/misprite.c
xorg-server/mi/mivaltree.c
xorg-server/os/utils.c
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h index e1e0cd7e0..1b6c9984c 100644 --- a/xorg-server/hw/xfree86/common/xf86.h +++ b/xorg-server/hw/xfree86/common/xf86.h @@ -331,7 +331,7 @@ extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePt /* xf86Option.c */ -extern _X_EXPORT void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts); +extern _X_EXPORT void xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts); /* xf86RandR.c */ |