diff options
| -rw-r--r-- | dix/main.c | 2 | ||||
| -rw-r--r-- | hw/xquartz/mach-startup/stub.c | 3 | ||||
| -rw-r--r-- | miext/rootless/rootlessScreen.c | 2 | ||||
| -rw-r--r-- | os/backtrace.c | 4 | ||||
| -rw-r--r-- | record/set.c | 11 |
5 files changed, 9 insertions, 13 deletions
diff --git a/dix/main.c b/dix/main.c index f96245a4b..a875d1251 100644 --- a/dix/main.c +++ b/dix/main.c @@ -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[]) diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c index c8686e78f..89f9e1058 100644 --- a/hw/xquartz/mach-startup/stub.c +++ b/hw/xquartz/mach-startup/stub.c @@ -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 */ diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index c73d5170b..7a799d98c 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -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 */ diff --git a/os/backtrace.c b/os/backtrace.c index dafb9904b..7ca6dab6d 100644 --- a/os/backtrace.c +++ b/os/backtrace.c @@ -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]); } } diff --git a/record/set.c b/record/set.c index 453452ec6..f0e094eed 100644 --- a/record/set.c +++ b/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; |