[PULL: xserver master] Fix conflicts between Xorg & Solaris system headers

Alan Coopersmith alan.coopersmith at oracle.com
Fri Feb 3 15:37:27 PST 2012


The following changes since commit 85cecd981191f9c3dab0fb13310d91eff643d423:

   XQuartz: Release all buttons and keys when deactivating (2012-01-30 14:23:08 
-0800)

are available in the git repository at:
   git://people.freedesktop.org/~alanc/xserver.git master

Alan Coopersmith (2):
       Stop including <sys/proc.h> from xf86_OSlib.h on Solaris
       Namespace list api to reduce conflicts with similar system headers

  dix/events.c                       |   18 +++---
  hw/xfree86/common/xf86Xinput.c     |   10 ++--
  hw/xfree86/dri2/dri2.c             |   20 +++---
  hw/xfree86/os-support/xf86_OSlib.h |    2 +-
  hw/xfree86/parser/InputClass.c     |   76 ++++++++++----------
  hw/xfree86/parser/xf86Parser.h     |   20 +++---
  include/inputstr.h                 |    4 +-
  include/list.h                     |  114 +++++++++++++++---------------
  test/input.c                       |   12 ++--
  test/list.c                        |  132 ++++++++++++++++++------------------
  xfixes/cursor.c                    |   16 ++--
  11 files changed, 212 insertions(+), 212 deletions(-)

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list