diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-16 16:32:31 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-16 16:32:31 +0000 |
| commit | e9cda97b38a5987aad2260f5153992d43bec16ce (patch) | |
| tree | 94f0b93f5a343f528bec5474d222a510e4fb9442 /xorg-server/hw/xquartz/quartzStartup.c | |
| parent | c59dda05406935ac1aaf11bf8cbd1b3140d8d115 (diff) | |
| parent | f851244b9298d88c29331ab285c2839d8bee6925 (diff) | |
| download | vcxsrv-e9cda97b38a5987aad2260f5153992d43bec16ce.tar.gz vcxsrv-e9cda97b38a5987aad2260f5153992d43bec16ce.tar.bz2 vcxsrv-e9cda97b38a5987aad2260f5153992d43bec16ce.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/quartzStartup.c')
| -rw-r--r-- | xorg-server/hw/xquartz/quartzStartup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/xquartz/quartzStartup.c b/xorg-server/hw/xquartz/quartzStartup.c index ba92ecef6..36c8182ae 100644 --- a/xorg-server/hw/xquartz/quartzStartup.c +++ b/xorg-server/hw/xquartz/quartzStartup.c @@ -40,7 +40,6 @@ #include "X11Controller.h" #include "darwin.h" #include "darwinEvents.h" -#include "quartzAudio.h" #include "quartz.h" #include "opaque.h" #include "micmap.h" @@ -117,9 +116,6 @@ int server_main(int argc, char **argv, char **envp) { } } - /* Create the audio mutex */ - QuartzAudioInit(); - X11ControllerMain(argc, argv, envp); exit(0); } |