diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-15 15:05:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-15 15:05:16 +0000 |
| commit | 1915b018a54e991c9289ee0c03488294e890caea (patch) | |
| tree | 0eccc8afdcbcee10f91cfe418fc8c7cdcd4b0163 /xorg-server/hw/xquartz/mach-startup/stub.c | |
| parent | 8bfa2f879ea38340a633c29120758a390b63667e (diff) | |
| parent | 4db64b701ca08687df5932321d48f2ef29b99fed (diff) | |
| download | vcxsrv-1915b018a54e991c9289ee0c03488294e890caea.tar.gz vcxsrv-1915b018a54e991c9289ee0c03488294e890caea.tar.bz2 vcxsrv-1915b018a54e991c9289ee0c03488294e890caea.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/mach-startup/stub.c')
| -rw-r--r-- | xorg-server/hw/xquartz/mach-startup/stub.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/xorg-server/hw/xquartz/mach-startup/stub.c b/xorg-server/hw/xquartz/mach-startup/stub.c index cee811695..7a557bd3f 100644 --- a/xorg-server/hw/xquartz/mach-startup/stub.c +++ b/xorg-server/hw/xquartz/mach-startup/stub.c @@ -40,15 +40,11 @@ #include <sys/socket.h> #include <sys/un.h> -static char *server_bootstrap_name = "org.x.X11"; - -/* The launchd startup is only designed for the primary X11.app that is - * org.x.X11... server_bootstrap_name might be differnet if we were triggered to - * start by another X11.app. - */ -#define kX11AppBundleId "org.x.X11" +#define kX11AppBundleId LAUNCHD_ID_PREFIX".X11" #define kX11AppBundlePath "/Contents/MacOS/X11" +static char *server_bootstrap_name = kX11AppBundleId; + #include <mach/mach.h> #include <mach/mach_error.h> #include <servers/bootstrap.h> |