frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Miscellaneous compilation warning fixes 

main.c:134: warning: no previous prototype for 'dix_main'
rootlessScreen.c: In function 'RootlessMarkOverlappedWindows':
rootlessScreen.c:434: warning: function declaration isn't a prototype
backtrace.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
backtrace.c:54: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
set.c: In function 'RecordSetMemoryRequirements':
set.c:413: warning: old-style function definition
set.c: In function 'RecordCreateSet':
set.c:425: warning: old-style function definition
stub.c: In function ‘main’:
stub.c:236: warning: ISO C90 forbids mixed declarations and code

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
This commit is contained in:
Jeremy Huddleston 2009-12-08 15:50:28 -08:00
parent 955b9f23a3
commit 1b8f90aa8b
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/main.c
View File

@ -127,6 +127,8 @@ BOOL serverInitComplete = FALSE;
pthread_mutex_t serverInitCompleteMutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t serverInitCompleteMutex = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t serverInitCompleteCond = PTHREAD_COND_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[]) int dix_main(int argc, char *argv[], char *envp[])
#else #else
int main(int argc, char *argv[], char *envp[]) int main(int argc, char *argv[], char *envp[])

3
hw/xquartz/mach-startup/stub.c
View File

@ -232,8 +232,9 @@ int main(int argc, char **argv, char **envp) {
kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp); kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
if(kr != KERN_SUCCESS) { if(kr != KERN_SUCCESS) {
fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name);
pid_t child; pid_t child;
fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name);
set_x11_path(); set_x11_path();
/* This forking is ugly and will be cleaned up later */ /* This forking is ugly and will be cleaned up later */

2
miext/rootless/rootlessScreen.c
View File

@ -431,7 +431,7 @@ RootlessMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
register WindowPtr pChild; register WindowPtr pChild;
Bool anyMarked = FALSE; Bool anyMarked = FALSE;
void (* MarkWindow)() = pScreen->MarkWindow; MarkWindowProcPtr MarkWindow = pScreen->MarkWindow;
RL_DEBUG_MSG("is top level! "); RL_DEBUG_MSG("is top level! ");
/* single layered systems are easy */ /* single layered systems are easy */

4
os/backtrace.c
View File

@ -48,10 +48,10 @@ void xorg_backtrace(void)
mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)"; mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)";
if (info.dli_saddr) if (info.dli_saddr)
ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod, 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 else
ErrorF("%d: %s (%p+0x%lx) [%p]\n", i, mod, 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
View File

@ -406,10 +406,7 @@ _RecordSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals,
/* user-visible functions */ /* user-visible functions */
int int
RecordSetMemoryRequirements(pIntervals, nIntervals, alignment) RecordSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals, int *alignment)
RecordSetInterval *pIntervals;
int nIntervals;
int *alignment;
{ {
RecordCreateSetProcPtr pCreateSet; RecordCreateSetProcPtr pCreateSet;
return _RecordSetMemoryRequirements(pIntervals, nIntervals, alignment, return _RecordSetMemoryRequirements(pIntervals, nIntervals, alignment,
@ -417,11 +414,7 @@ RecordSetMemoryRequirements(pIntervals, nIntervals, alignment)
} }
RecordSetPtr RecordSetPtr
RecordCreateSet(pIntervals, nIntervals, pMem, memsize) RecordCreateSet(RecordSetInterval *pIntervals, int nIntervals, void *pMem, int memsize)
RecordSetInterval *pIntervals;
int nIntervals;
void *pMem;
int memsize;
{ {
RecordCreateSetProcPtr pCreateSet; RecordCreateSetProcPtr pCreateSet;
int alignment; int alignment;