diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 17:37:31 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 17:37:31 +0930 |
| commit | 26c1958c322be3ac4dfec9ba2c41c5202bd03709 (patch) | |
| tree | 0889c707db86e00f557618f3917b93e1a0472014 /hw/xnest | |
| parent | 5fe57787faa2ea4f2f57b25455d200bf924206d6 (diff) | |
| parent | 29586101dc11d498b212510f8dedbfeca7f8c859 (diff) | |
Merge branch 'master' into mpx
Diffstat (limited to 'hw/xnest')
| -rw-r--r-- | hw/xnest/Args.c | 10 | ||||
| -rw-r--r-- | hw/xnest/Makefile.am | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 209f175ab..b95f70093 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -49,16 +49,6 @@ int xnestNumScreens = 0; Bool xnestDoDirectColormaps = False; Window xnestParentWindow = 0; -/* ddxInitGlobals - called by |InitGlobals| from os/util.c */ -void ddxInitGlobals(void) -{ -#ifdef COMPOSITE - /* XXX terrible hack */ - extern Bool noCompositeExtension; - noCompositeExtension = TRUE; -#endif -} - int ddxProcessArgument (int argc, char *argv[], int i) { diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index 8601b2988..f95aab140 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -56,6 +56,7 @@ Xnest_SOURCES = $(SRCS) Xnest_DEPENDENCIES = $(XNEST_LIBS) Xnest_LDADD = $(XNEST_LIBS) $(XNEST_SYS_LIBS) $(XSERVER_SYS_LIBS) +Xnest_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) EXTRA_DIST = icon \ screensaver \ |