diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-08 09:33:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-08 09:33:13 +0200 |
| commit | 990bc3f015a4f8fce2eb918375defcd44980a845 (patch) | |
| tree | 8e8301f19482b52cc00bd95b4593522cc93267af /xorg-server/xfixes | |
| parent | 1af6fc1b5d93e54d6674de8b5870448b29f139a7 (diff) | |
| download | vcxsrv-990bc3f015a4f8fce2eb918375defcd44980a845.tar.gz vcxsrv-990bc3f015a4f8fce2eb918375defcd44980a845.tar.bz2 vcxsrv-990bc3f015a4f8fce2eb918375defcd44980a845.zip | |
Used synchronise script to update files
Diffstat (limited to 'xorg-server/xfixes')
| -rw-r--r-- | xorg-server/xfixes/Makefile.am | 32 | ||||
| -rw-r--r-- | xorg-server/xfixes/cursor.c | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/xorg-server/xfixes/Makefile.am b/xorg-server/xfixes/Makefile.am index a8425e8ea..7f4d4d285 100644 --- a/xorg-server/xfixes/Makefile.am +++ b/xorg-server/xfixes/Makefile.am @@ -1,16 +1,16 @@ -noinst_LTLIBRARIES = libxfixes.la - -AM_CFLAGS = $(DIX_CFLAGS) - -if XORG -sdk_HEADERS = xfixes.h -endif - -libxfixes_la_SOURCES = \ - cursor.c \ - region.c \ - saveset.c \ - select.c \ - xfixes.c \ - xfixes.h \ - xfixesint.h +noinst_LTLIBRARIES = libxfixes.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+if XORG
+sdk_HEADERS = xfixes.h
+endif
+
+libxfixes_la_SOURCES = \
+ cursor.c \
+ region.c \
+ saveset.c \
+ select.c \
+ xfixes.c \
+ xfixes.h \
+ xfixesint.h
diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c index 602b9061e..467529a4f 100644 --- a/xorg-server/xfixes/cursor.c +++ b/xorg-server/xfixes/cursor.c @@ -190,7 +190,7 @@ CursorDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor) } static Bool -CursorCloseScreen(int index, ScreenPtr pScreen) +CursorCloseScreen(ScreenPtr pScreen) { CursorScreenPtr cs = GetCursorScreen(pScreen); Bool ret; @@ -202,7 +202,7 @@ CursorCloseScreen(int index, ScreenPtr pScreen) Unwrap(cs, pScreen, DisplayCursor, display_proc); Unwrap(cs, pScreen, ConstrainCursorHarder, constrain_proc); deleteCursorHideCountsForScreen(pScreen); - ret = (*pScreen->CloseScreen) (index, pScreen); + ret = (*pScreen->CloseScreen) (pScreen); free(cs); return ret; } |