← Back to branch summary

~ubuntu-branches/ubuntu/precise/xorg-server-lts-saucy/precise-proposed

« back to all changes in this revision

Viewing changes to hw/xquartz/X11Controller.m

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2014-04-22 12:44:45 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140422124445-p9q3hh90tprcnalo
Tags: 2:1.14.6-0ubuntu1~precise1
Copy SRU back to precise.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xquartz/X11Controller.m
347
347
    const char *newargv[4];
348
348
    char buf[128];
349
349
    char *s;
350
 
#if 0 && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
 
350
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
351
351
    int stdout_pipe[2];
352
352
    int stderr_pipe[2];
353
353
#endif
363
363
        setenv("DISPLAY", buf, TRUE);
364
364
    }
365
365
 
366
 
#if 0 && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
 
366
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
367
367
    if (asl_log_descriptor) {
368
368
        char *asl_sender;
369
369
        aslmsg amsg = asl_new(ASL_TYPE_MSG);
413
413
            _exit(1);
414
414
 
415
415
        case 0:                                     /* child2 */
416
 
#if 0 && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
 
416
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
417
417
            if (asl_log_descriptor) {
418
418
                /* Replace our stdout/stderr */
419
419
                dup2(stdout_pipe[1], STDOUT_FILENO);
442
442
        waitpid(child1, &status, 0);
443
443
    }
444
444
 
445
 
#if 0 && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
 
445
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
446
446
    if (asl_log_descriptor) {
447
447
        /* Close the write ends of the pipe */
448
448
        close(stdout_pipe[1]);
934
934
            == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
935
935
}
936
936
 
937
 
- (void) applicationWillTerminate:(NSNotification *)aNotification
 
937
- (void) applicationWillTerminate:(NSNotification *)aNotification _X_NORETURN
938
938
{
939
939
    int remain;
940
940
    [X11App prefs_synchronize];