diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-18 08:03:04 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-18 08:03:04 +0200 |
| commit | 7f669a708bd35bdf8e842f762ec68f9ad0ec0486 (patch) | |
| tree | 332fc6d6e6f70503d717249e4e387bf3eea29637 /xorg-server | |
| parent | a7d3f63ee5e292379ed6d6eba0c65512205a4786 (diff) | |
| download | vcxsrv-7f669a708bd35bdf8e842f762ec68f9ad0ec0486.tar.gz vcxsrv-7f669a708bd35bdf8e842f762ec68f9ad0ec0486.tar.bz2 vcxsrv-7f669a708bd35bdf8e842f762ec68f9ad0ec0486.zip | |
libX11 mesa pixman xserver git update 18 Sep 2013
xserver commit 8010d3a48bd0b224dcb0883e39c2351ad364d846
libX11 commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b
pixman commit 58a79dfe6d1fd62c2b66c69fdb64f6b8ecf61da5
mesa commit a3b51a22f71819236baa6bbda9d0d050914b149d
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/hw/xquartz/Makefile.am | 1 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/pbproxy/x-selection.m | 3 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/xpr/Makefile.am | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/hw/xquartz/Makefile.am b/xorg-server/hw/xquartz/Makefile.am index 2e894d705..2ca953cf9 100644 --- a/xorg-server/hw/xquartz/Makefile.am +++ b/xorg-server/hw/xquartz/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -DUSE_NEW_CLUT \ -DXFree86Server \ -I$(top_srcdir)/miext/rootless \ + -I$(top_builddir)/pseudoramiX \ -DX11LIBDIR=\"$(libdir)\" if GLX diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.m b/xorg-server/hw/xquartz/pbproxy/x-selection.m index 57ddb743a..f4f4de88e 100644 --- a/xorg-server/hw/xquartz/pbproxy/x-selection.m +++ b/xorg-server/hw/xquartz/pbproxy/x-selection.m @@ -85,8 +85,7 @@ static struct propdata null_propdata = { static void dump_prefs() { - ErrorF(fp, - "pbproxy preferences:\n" + ErrorF("pbproxy preferences:\n" "\tactive %u\n" "\tprimary_on_grab %u\n" "\tclipboard_to_pasteboard %u\n" diff --git a/xorg-server/hw/xquartz/xpr/Makefile.am b/xorg-server/hw/xquartz/xpr/Makefile.am index 763a7cd5c..c654ee595 100644 --- a/xorg-server/hw/xquartz/xpr/Makefile.am +++ b/xorg-server/hw/xquartz/xpr/Makefile.am @@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libXquartzXpr.la AM_CFLAGS = $(DIX_CFLAGS) AM_CPPFLAGS = \ -I$(srcdir) -I$(srcdir)/.. \ + -I$(top_builddir)/pseudoramiX \ -I$(top_srcdir)/miext \ -I$(top_srcdir)/miext/rootless |