[PATCH 0/2] Resolve conflicts between Xorg & Solaris list.h

Alan Coopersmith alan.coopersmith at oracle.com
Fri Jan 27 21:55:29 PST 2012


This change is both cleaner than my previous attempt (which just hid
the Solaris <sys/list.h> from the current set of files that ended up
with both) and messier, since it changes calls all over the X server.

It doesn't break ABI, since the list implementation is self-contained
in the header file and exports no symbols, and all the drivers I normally
build continued to build fine with it.

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(-)

-- 
1.7.3.2



More information about the xorg-devel mailing list