xserver: Branch 'xorg-server-1.6-apple'

[Jeremy Huddleston]

 hw/xquartz/pbproxy/app-main.m |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 71a4dcb1d8cb2962d99e34262886930fc30429c8
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue May 5 20:27:53 2009 -0700

    XQuartz: pbproxy standalone: added missing variable declarations.
    (cherry picked from commit 2d947d17a3ef5fb8cef959bff0eb08b8bb5b6548)

diff --git a/hw/xquartz/pbproxy/app-main.m b/hw/xquartz/pbproxy/app-main.m
index cb0fa57..d4b43c6 100644
--- a/hw/xquartz/pbproxy/app-main.m
+++ b/hw/xquartz/pbproxy/app-main.m
@@ -50,6 +50,9 @@ static void signal_handler (int sig) {
 }
 
 int main (int argc, const char *argv[]) {
+    const char *s;
+    int i;
+
 #ifdef DEBUG
     printf("pid: %u\n", getpid());
 #endif