Xquartz: Use X11ControllerMain()
(cherry picked from commit a9ac932543
)
This commit is contained in:
parent
1393a97ea9
commit
2d15d439f8
|
@ -72,7 +72,7 @@ void X11ApplicationSetCanQuit (int state);
|
|||
void X11ApplicationServerReady (void);
|
||||
void X11ApplicationShowHideMenubar (int state);
|
||||
|
||||
void X11ApplicationMain(int argc, char **argv, void (*server_thread) (void *), void *server_arg);
|
||||
void X11ApplicationMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg);
|
||||
|
||||
extern int X11EnableKeyEquivalents;
|
||||
extern int quartzHasRoot, quartzEnableRootless;
|
||||
|
|
|
@ -790,7 +790,7 @@ environment?", @"Startup xinitrc dialog");
|
|||
[X11App prefs_synchronize];
|
||||
}
|
||||
|
||||
void X11ApplicationMain (int argc, char **argv, void (*server_thread) (void *), void *server_arg) {
|
||||
void X11ApplicationMain (int argc, const char **argv, void (*server_thread) (void *), void *server_arg) {
|
||||
NSAutoreleasePool *pool;
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
|
@ -78,4 +78,6 @@
|
|||
|
||||
#endif /* __OBJC__ */
|
||||
|
||||
void X11ControllerMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg);
|
||||
|
||||
#endif /* X11CONTROLLER_H */
|
||||
|
|
|
@ -741,3 +741,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
|
|||
}
|
||||
|
||||
@end
|
||||
|
||||
void X11ControllerMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg) {
|
||||
X11ApplicationMain (argc, argv, server_thread, server_arg);
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <unistd.h>
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
#include "quartzCommon.h"
|
||||
#include "X11Application.h"
|
||||
#include "X11Controller.h"
|
||||
#include "darwin.h"
|
||||
#include "quartz.h"
|
||||
#include "opaque.h"
|
||||
|
@ -106,6 +106,6 @@ void DarwinHandleGUI(int argc, char **argv, char **envp) {
|
|||
extern void _InitHLTB(void);
|
||||
|
||||
_InitHLTB();
|
||||
X11ApplicationMain(argc, argv, server_thread, NULL);
|
||||
X11ControllerMain(argc, argv, server_thread, NULL);
|
||||
exit(0);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user