diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-08 14:29:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-08 14:50:37 +0200 |
| commit | 72ec0e3bb2d7fc6b77b2a75873792f781679da6a (patch) | |
| tree | 0a736ab9a8c26276929ab077dc661e3625b54884 /xorg-server/miext/rootless | |
| parent | 5e865910f0ce672295bd60460631339be5e311a0 (diff) | |
| parent | 990bc3f015a4f8fce2eb918375defcd44980a845 (diff) | |
| download | vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.gz vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.bz2 vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/.gitignore
libX11/src/ConvSel.c
libX11/src/CrGlCur.c
libX11/src/CrWindow.c
libX11/src/GetDflt.c
libX11/src/Window.c
libX11/src/xlibi18n/XimProto.h
libX11/src/xlibi18n/lcDynamic.c
libxcb/src/.gitignore
libxcb/src/xcb_ext.c
libxcb/src/xcb_xid.c
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mapi/glapi/glapi_getproc.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/program/.gitignore
xkbcomp/listing.c
xkbcomp/xkbpath.c
xorg-server/.gitignore
xorg-server/Xext/xvmain.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/winpriv.h
xorg-server/hw/xwin/winprefsyacc.y
xorg-server/hw/xwin/winscrinit.c
xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
xorg-server/xkeyboard-config/rules/bin/ml_s.sh
xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'xorg-server/miext/rootless')
| -rw-r--r-- | xorg-server/miext/rootless/Makefile.am | 32 | ||||
| -rw-r--r-- | xorg-server/miext/rootless/rootlessScreen.c | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/xorg-server/miext/rootless/Makefile.am b/xorg-server/miext/rootless/Makefile.am index 72d299bcc..c97bebebe 100644 --- a/xorg-server/miext/rootless/Makefile.am +++ b/xorg-server/miext/rootless/Makefile.am @@ -1,16 +1,16 @@ -AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS)
-
-noinst_LTLIBRARIES = librootless.la
-librootless_la_SOURCES = \
- rootlessCommon.c \
- rootlessGC.c \
- rootlessScreen.c \
- rootlessValTree.c \
- rootlessWindow.c
-
-EXTRA_DIST = \
- README.txt \
- rootless.h \
- rootlessCommon.h \
- rootlessConfig.h \
- rootlessWindow.h
+AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) + +noinst_LTLIBRARIES = librootless.la +librootless_la_SOURCES = \ + rootlessCommon.c \ + rootlessGC.c \ + rootlessScreen.c \ + rootlessValTree.c \ + rootlessWindow.c + +EXTRA_DIST = \ + README.txt \ + rootless.h \ + rootlessCommon.h \ + rootlessConfig.h \ + rootlessWindow.h diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c index ecc72ea92..a1af3e7ac 100644 --- a/xorg-server/miext/rootless/rootlessScreen.c +++ b/xorg-server/miext/rootless/rootlessScreen.c @@ -138,7 +138,7 @@ RootlessCreateScreenResources(ScreenPtr pScreen) } static Bool -RootlessCloseScreen(int i, ScreenPtr pScreen) +RootlessCloseScreen(ScreenPtr pScreen) { RootlessScreenRec *s; @@ -154,7 +154,7 @@ RootlessCloseScreen(int i, ScreenPtr pScreen) } free(s); - return pScreen->CloseScreen(i, pScreen); + return pScreen->CloseScreen(pScreen); } static void |