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/os-support/shared | |
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/os-support/shared')
-rw-r--r-- | xorg-server/hw/xfree86/os-support/shared/posix_tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c index fb8386022..cc12a31f2 100644 --- a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c +++ b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c @@ -112,7 +112,7 @@ GetBaud (int baudrate) } int -xf86OpenSerial (pointer options) +xf86OpenSerial (XF86OptionPtr options) { struct termios t; int fd, i; @@ -185,7 +185,7 @@ xf86OpenSerial (pointer options) } int -xf86SetSerial (int fd, pointer options) +xf86SetSerial (int fd, XF86OptionPtr options) { struct termios t; int val; |