xserver: Branch 'master' - 3 commits
Keith Packard
keithp at kemper.freedesktop.org
Fri Dec 11 09:34:58 PST 2009
dix/main.c | 2 ++
hw/xquartz/mach-startup/stub.c | 3 ++-
hw/xquartz/pbproxy/Makefile.am | 3 +++
miext/rootless/rootlessScreen.c | 2 +-
os/backtrace.c | 4 ++--
record/set.c | 11 ++---------
6 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit d3e054ac07dae12a82ad764b0622fddbef4b9ec5
Merge: 12fb318... 97a6454...
Author: Keith Packard <keithp at keithp.com>
Date: Fri Dec 11 09:22:22 2009 -0800
Merge remote branch 'jeremyhu/master'
commit 97a6454ea57587db490873fee8ff0f899882972d
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Wed Dec 9 18:27:31 2009 -0800
XQuartz: pbproxy: Fix building of standalone xpbproxy executable
Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>
diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am
index e1c537f..02da6b2 100644
--- a/hw/xquartz/pbproxy/Makefile.am
+++ b/hw/xquartz/pbproxy/Makefile.am
@@ -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
commit 1b8f90aa8b1017c74b254db2f398131b857323d4
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Tue Dec 8 15:50:28 2009 -0800
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 at freedesktop.org>
diff --git a/dix/main.c b/dix/main.c
index f96245a..a875d12 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 c8686e7..89f9e10 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 c73d517..7a799d9 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 dafb990..7ca6dab 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 453452e..f0e094e 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;
More information about the xorg-commit
mailing list