[PULL] XQuartz -- Fix launching with ASan

2015-10-19 Thread Jeremy Huddleston Sequoia
Hey ajax,

Thanks for merging the warning fixes I sent.  I was actually going to just roll 
them into this pull-request once they were reviewed, but now it's just down to 
two XQuartz changes.

Thanks,
Jeremy


The following changes since commit ec6294116cc41ff1c3be081b626952fb7e614244:

  osinit: Silence -Wunused-variable warnings (2015-10-19 11:52:05 -0400)

are available in the git repository at:

  git://people.freedesktop.org/~jeremyhu/xserver 

for you to fetch changes up to 27ad21254f257bac6c647315d749ee69f20c24e0:

  XQuartz: Cleanup formatting of DarwinEQInit that was butchered by automation 
a few years ago (2015-10-19 09:06:22 -0700)


Jeremy Huddleston Sequoia (2):
  XQuartz: Make sure that darwin_all_modifier_mask_additions is 0-terminated
  XQuartz: Cleanup formatting of DarwinEQInit that was butchered by 
automation a few years ago

 hw/xquartz/darwinEvents.c | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PULL] XQuartz -- Fix launching with ASan

2015-10-19 Thread Adam Jackson
On Mon, 2015-10-19 at 09:15 -0700, Jeremy Huddleston Sequoia wrote:
> Hey ajax,
> 
> Thanks for merging the warning fixes I sent.  I was actually going to
> just roll them into this pull-request once they were reviewed, but
> now it's just down to two XQuartz changes.

No problem, I'm trying to be proactive about merging things that look
sane and get review rather than waiting for pull requests, since I know
I often don't get around to sending my own pull requests promptly.

Merged:

To ssh://git.freedesktop.org/git/xorg/xserver
   1d4aa67..5b582a4  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel