aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-10-19 21:03:53 +0000
committermarha <marha@users.sourceforge.net>2010-10-19 21:03:53 +0000
commitbe10ad8a9efe4131c14c2dde36adaf11e7b125aa (patch)
tree0a0f9305b181d427c5581f7a072e69e52199bdbb /xorg-server/hw/xwin/Makefile.am
parent2197318e5fc026ee57325ce953113d1963e7dc82 (diff)
parent6ab3babba7b1b74528c2194a495fa1e2e67faa55 (diff)
downloadvcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.gz
vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.bz2
vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/Makefile.am')
-rw-r--r--xorg-server/hw/xwin/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am
index b32331315..3173fb59d 100644
--- a/xorg-server/hw/xwin/Makefile.am
+++ b/xorg-server/hw/xwin/Makefile.am
@@ -163,8 +163,8 @@ AM_YFLAGS = -d
AM_LFLAGS = -i
AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
$(XWINMODULES_CFLAGS) \
- -DXFree86Server \
- -I$(top_srcdir)
+ -I$(top_srcdir) \
+ -Wno-bad-function-cast
MAN_SRCS = XWin.man.pre XWinrc.man.pre