frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: More Tiger cleanup: bootstrap_strerror 

(cherry picked from commit 37f535aff3e9a7a02711daa98152cdff97745622)
This commit is contained in:
Jeremy Huddleston 2008-11-22 15:47:14 -08:00
parent 208f091bfc
commit ab12c75162
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xquartz/mach-startup/bundle-main.c
View File

@ -29,6 +29,7 @@
prior written authorization. */ prior written authorization. */
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <AvailabilityMacros.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <unistd.h> #include <unistd.h>
@ -374,7 +375,11 @@ int startup_trigger(int argc, char **argv, char **envp) {
kr = bootstrap_look_up(bootstrap_port, SERVER_BOOTSTRAP_NAME, &mp); kr = bootstrap_look_up(bootstrap_port, SERVER_BOOTSTRAP_NAME, &mp);
if (kr != KERN_SUCCESS) { if (kr != KERN_SUCCESS) {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
fprintf(stderr, "bootstrap_look_up(): %s\n", bootstrap_strerror(kr)); fprintf(stderr, "bootstrap_look_up(): %s\n", bootstrap_strerror(kr));
#else
fprintf(stderr, "bootstrap_look_up(): %ul\n", (unsigned long)kr);
#endif
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

6
hw/xquartz/mach-startup/stub.c
View File

@ -267,7 +267,11 @@ int main(int argc, char **argv, char **envp) {
} }
if(kr != KERN_SUCCESS) { if(kr != KERN_SUCCESS) {
fprintf(stderr, "Xquartz: bootstrap_look_up(): Timed out: %s\n", bootstrap_strerror(kr)); #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
fprintf(stderr, "Xquartz: bootstrap_look_up(): %s\n", bootstrap_strerror(kr));
#else
fprintf(stderr, "Xquartz: bootstrap_look_up(): %ul\n", (unsigned long)kr);
#endif
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }