diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-15 08:09:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-15 08:09:08 +0000 |
| commit | c915fe74ff1b1d02f7506a187bc9b588f5c21f97 (patch) | |
| tree | 7ecc8f8867bac10fcfc1299469333178f7cf5838 /xorg-server/hw | |
| parent | 0925cb4f76a1667fb3777efbe6a0e0e69c4cca3c (diff) | |
| parent | 9b17452909d3140fa33a753cadfaa6e9006b9685 (diff) | |
| download | vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.tar.gz vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.tar.bz2 vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Configure.c | 1 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/mach-startup/stub.c | 3 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/pbproxy/Makefile.am | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c index 2df6b4ec3..d74d90bdd 100644 --- a/xorg-server/hw/xfree86/common/xf86Configure.c +++ b/xorg-server/hw/xfree86/common/xf86Configure.c @@ -577,7 +577,6 @@ static void handle_detailed_input(struct detailed_monitor_section *det_mon, static XF86ConfMonitorPtr configureDDCMonitorSection (int screennum) { - int i = 0; int len, mon_width, mon_height; #define displaySizeMaxLen 80 char displaySize_string[displaySizeMaxLen]; diff --git a/xorg-server/hw/xquartz/mach-startup/stub.c b/xorg-server/hw/xquartz/mach-startup/stub.c index c8686e78f..89f9e1058 100644 --- a/xorg-server/hw/xquartz/mach-startup/stub.c +++ b/xorg-server/hw/xquartz/mach-startup/stub.c @@ -232,8 +232,9 @@ int main(int argc, char **argv, char **envp) { kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp); if(kr != KERN_SUCCESS) { - fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name); pid_t child; + + fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name); set_x11_path(); /* This forking is ugly and will be cleaned up later */ diff --git a/xorg-server/hw/xquartz/pbproxy/Makefile.am b/xorg-server/hw/xquartz/pbproxy/Makefile.am index e1c537fbb..02da6b265 100644 --- a/xorg-server/hw/xquartz/pbproxy/Makefile.am +++ b/xorg-server/hw/xquartz/pbproxy/Makefile.am @@ -15,6 +15,9 @@ if STANDALONE_XPBPROXY bin_PROGRAMS = xpbproxy xpbproxy_SOURCES = app-main.m xpbproxy_LDADD = libxpbproxy.la +xpbproxy_LDFLAGS = -Wl,-framework,Cocoa + +AM_CPPFLAGS += -DSTANDALONE_XPBPROXY endif |