xserver: Branch 'master' - 2 commits
Keith Packard
keithp at kemper.freedesktop.org
Tue Aug 28 11:09:33 PDT 2012
hw/xquartz/bundle/Info.plist.cpp | 4 ++--
test/os.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 486038fe16957b39d39842365c5409c494c9a8df
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon Aug 27 22:35:51 2012 -0700
XQuartz: Bump Info.plist version to 2.7.4
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 4b6d9d1..f76c5fc 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -19,9 +19,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.7.2</string>
+ <string>2.7.4</string>
<key>CFBundleVersion</key>
- <string>2.7.2</string>
+ <string>2.7.4</string>
<key>CFBundleSignature</key>
<string>x11a</string>
<key>CSResourcesFileMapped</key>
commit b90b3f6eac34616c46ab693fafbf6b73a04f407b
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon Aug 27 17:15:19 2012 -0700
test: Make os test more compliant
sighandler_t is not UNIX.
Regression from: 7f09126e068015db54c56bb982b8f91065375700
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/test/os.c b/test/os.c
index 8f1107d..2d005a0 100644
--- a/test/os.c
+++ b/test/os.c
@@ -149,7 +149,7 @@ static void block_sigio_test_nested(void)
tail guard
tail guard must be hit.
*/
- sighandler_t old_handler;
+ void (*old_handler)(int);
old_handler = signal(SIGIO, sighandler);
expect_signal = 1;
assert(raise(SIGIO) == 0);
More information about the xorg-commit
mailing list