Merge remote branch 'jeremyhu/master'
This commit is contained in:
commit
d3e054ac07
|
@ -127,6 +127,8 @@ BOOL serverInitComplete = FALSE;
|
|||
pthread_mutex_t serverInitCompleteMutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
pthread_cond_t serverInitCompleteCond = PTHREAD_COND_INITIALIZER;
|
||||
|
||||
int dix_main(int argc, char *argv[], char *envp[]);
|
||||
|
||||
int dix_main(int argc, char *argv[], char *envp[])
|
||||
#else
|
||||
int main(int argc, char *argv[], char *envp[])
|
||||
|
|
|
@ -232,8 +232,9 @@ int main(int argc, char **argv, char **envp) {
|
|||
|
||||
kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
|
||||
if(kr != KERN_SUCCESS) {
|
||||
fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name);
|
||||
pid_t child;
|
||||
|
||||
fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name);
|
||||
set_x11_path();
|
||||
|
||||
/* This forking is ugly and will be cleaned up later */
|
||||
|
|
|
@ -15,6 +15,9 @@ if STANDALONE_XPBPROXY
|
|||
bin_PROGRAMS = xpbproxy
|
||||
xpbproxy_SOURCES = app-main.m
|
||||
xpbproxy_LDADD = libxpbproxy.la
|
||||
xpbproxy_LDFLAGS = -Wl,-framework,Cocoa
|
||||
|
||||
AM_CPPFLAGS += -DSTANDALONE_XPBPROXY
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
@ -431,7 +431,7 @@ RootlessMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
|
|||
|
||||
register WindowPtr pChild;
|
||||
Bool anyMarked = FALSE;
|
||||
void (* MarkWindow)() = pScreen->MarkWindow;
|
||||
MarkWindowProcPtr MarkWindow = pScreen->MarkWindow;
|
||||
|
||||
RL_DEBUG_MSG("is top level! ");
|
||||
/* single layered systems are easy */
|
||||
|
|
|
@ -48,10 +48,10 @@ void xorg_backtrace(void)
|
|||
mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)";
|
||||
if (info.dli_saddr)
|
||||
ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod,
|
||||
info.dli_sname, (char *) array[i] - (char *) info.dli_saddr, array[i]);
|
||||
info.dli_sname, (long unsigned int)((char *) array[i] - (char *) info.dli_saddr), array[i]);
|
||||
else
|
||||
ErrorF("%d: %s (%p+0x%lx) [%p]\n", i, mod,
|
||||
info.dli_fbase, (char *) array[i] - (char *) info.dli_fbase, array[i]);
|
||||
info.dli_fbase, (long unsigned int)((char *) array[i] - (char *) info.dli_fbase), array[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
11
record/set.c
11
record/set.c
|
@ -406,10 +406,7 @@ _RecordSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals,
|
|||
/* user-visible functions */
|
||||
|
||||
int
|
||||
RecordSetMemoryRequirements(pIntervals, nIntervals, alignment)
|
||||
RecordSetInterval *pIntervals;
|
||||
int nIntervals;
|
||||
int *alignment;
|
||||
RecordSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals, int *alignment)
|
||||
{
|
||||
RecordCreateSetProcPtr pCreateSet;
|
||||
return _RecordSetMemoryRequirements(pIntervals, nIntervals, alignment,
|
||||
|
@ -417,11 +414,7 @@ RecordSetMemoryRequirements(pIntervals, nIntervals, alignment)
|
|||
}
|
||||
|
||||
RecordSetPtr
|
||||
RecordCreateSet(pIntervals, nIntervals, pMem, memsize)
|
||||
RecordSetInterval *pIntervals;
|
||||
int nIntervals;
|
||||
void *pMem;
|
||||
int memsize;
|
||||
RecordCreateSet(RecordSetInterval *pIntervals, int nIntervals, void *pMem, int memsize)
|
||||
{
|
||||
RecordCreateSetProcPtr pCreateSet;
|
||||
int alignment;
|
||||
|
|
Loading…
Reference in New Issue
Block a user