XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
(cherry picked from commit 49668e8a88
)
This commit is contained in:
parent
9025097f06
commit
f7b8efa23d
|
@ -51,6 +51,8 @@
|
|||
/* From darwinEvents.c ... but don't want to pull in all the server cruft */
|
||||
void DarwinListenOnOpenFD(int fd);
|
||||
|
||||
extern int noPanoramiXExtension;
|
||||
|
||||
#define DEFAULT_CLIENT "/usr/X11/bin/xterm"
|
||||
#define DEFAULT_STARTX "/usr/X11/bin/startx"
|
||||
#define DEFAULT_SHELL "/bin/sh"
|
||||
|
@ -359,6 +361,9 @@ int main(int argc, char **argv, char **envp) {
|
|||
mach_msg_size_t mxmsgsz = sizeof(union MaxMsgSize) + MAX_TRAILER_SIZE;
|
||||
mach_port_t mp;
|
||||
kern_return_t kr;
|
||||
|
||||
// The server must not run the PanoramiX operations.
|
||||
noPanoramiXExtension = TRUE;
|
||||
|
||||
fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
|
||||
for(i=1; i < argc; i++) {
|
||||
|
|
|
@ -46,7 +46,6 @@ Equipment Corporation.
|
|||
#include "globals.h"
|
||||
|
||||
Bool noPseudoramiXExtension = FALSE;
|
||||
extern int noPanoramiXExtension;
|
||||
|
||||
extern int ProcPanoramiXQueryVersion (ClientPtr client);
|
||||
|
||||
|
@ -131,9 +130,6 @@ void PseudoramiXExtensionInit(int argc, char *argv[])
|
|||
}
|
||||
#endif
|
||||
|
||||
// The server must not run the PanoramiX operations.
|
||||
noPanoramiXExtension = TRUE;
|
||||
|
||||
if (pseudoramiXGeneration != serverGeneration) {
|
||||
extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
|
||||
ProcPseudoramiXDispatch,
|
||||
|
|
|
@ -44,10 +44,6 @@
|
|||
|
||||
#include "darwin.h"
|
||||
|
||||
extern void FatalError(const char *, ...);
|
||||
extern char *display;
|
||||
extern int noPanoramiXExtension;
|
||||
|
||||
/*
|
||||
* QuartzWriteCocoaPasteboard
|
||||
* Write text to the Mac OS X pasteboard.
|
||||
|
|
Loading…
Reference in New Issue
Block a user