Used synchronise script to update files

5 files changed, 58 insertions, 58 deletions

diff --git a/xorg-server/fb/Makefile.am b/xorg-server/fb/Makefile.am
index 1b0302ed1..89f3babb1 100644
--- a/xorg-server/fb/Makefile.am
+++ b/xorg-server/fb/Makefile.am
@@ -1,54 +1,54 @@
-noinst_LTLIBRARIES = libfb.la libwfb.la

-

-AM_CFLAGS = $(DIX_CFLAGS)

-

-if XORG

-sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h

-endif

-

-libfb_la_CFLAGS = $(AM_CFLAGS)

-libfb_la_LIBADD = $(PIXMAN_LIBS)

-

-libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER

-libwfb_la_LIBADD = $(PIXMAN_LIBS)

-

-libfb_la_SOURCES = 	\

-	fb.h		\

-	fb24_32.c	\

-	fb24_32.h	\

-	fballpriv.c	\

-	fbarc.c		\

-	fbbits.c	\

-	fbbits.h	\

-	fbblt.c		\

-	fbbltone.c	\

-	fbcopy.c	\

-	fbfill.c	\

-	fbfillrect.c	\

-	fbfillsp.c	\

-	fbgc.c		\

-	fbgetsp.c	\

-	fbglyph.c	\

-	fbimage.c	\

-	fbline.c	\

-	fboverlay.c	\

-	fboverlay.h	\

-	fbpict.c	\

-	fbpict.h	\

-	fbpixmap.c	\

-	fbpoint.c	\

-	fbpush.c	\

-	fbrop.h		\

-	fbscreen.c	\

-	fbseg.c		\

-	fbsetsp.c	\

-	fbsolid.c	\

-	fbstipple.c	\

-	fbtile.c	\

-	fbtrap.c	\

-	fbutil.c	\

-	fbwindow.c

-

-libwfb_la_SOURCES = $(libfb_la_SOURCES)

-

-EXTRA_DIST = fbcmap_mi.c

+noinst_LTLIBRARIES = libfb.la libwfb.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+if XORG
+sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h
+endif
+
+libfb_la_CFLAGS = $(AM_CFLAGS)
+libfb_la_LIBADD = $(PIXMAN_LIBS)
+
+libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
+libwfb_la_LIBADD = $(PIXMAN_LIBS)
+
+libfb_la_SOURCES = 	\
+	fb.h		\
+	fb24_32.c	\
+	fb24_32.h	\
+	fballpriv.c	\
+	fbarc.c		\
+	fbbits.c	\
+	fbbits.h	\
+	fbblt.c		\
+	fbbltone.c	\
+	fbcopy.c	\
+	fbfill.c	\
+	fbfillrect.c	\
+	fbfillsp.c	\
+	fbgc.c		\
+	fbgetsp.c	\
+	fbglyph.c	\
+	fbimage.c	\
+	fbline.c	\
+	fboverlay.c	\
+	fboverlay.h	\
+	fbpict.c	\
+	fbpict.h	\
+	fbpixmap.c	\
+	fbpoint.c	\
+	fbpush.c	\
+	fbrop.h		\
+	fbscreen.c	\
+	fbseg.c		\
+	fbsetsp.c	\
+	fbsolid.c	\
+	fbstipple.c	\
+	fbtile.c	\
+	fbtrap.c	\
+	fbutil.c	\
+	fbwindow.c
+
+libwfb_la_SOURCES = $(libfb_la_SOURCES)
+
+EXTRA_DIST = fbcmap_mi.c
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h
index b327ce653..cc3b6ee61 100644
--- a/xorg-server/fb/fb.h
+++ b/xorg-server/fb/fb.h
@@ -1419,7 +1419,7 @@ fbPushPixels(GCPtr pGC,
  */
 
 extern _X_EXPORT Bool
- fbCloseScreen(int indx, ScreenPtr pScreen);
+ fbCloseScreen(ScreenPtr pScreen);
 
 extern _X_EXPORT Bool
  fbRealizeFont(ScreenPtr pScreen, FontPtr pFont);
diff --git a/xorg-server/fb/fboverlay.c b/xorg-server/fb/fboverlay.c
index 998be66d9..a882ffa39 100644
--- a/xorg-server/fb/fboverlay.c
+++ b/xorg-server/fb/fboverlay.c
@@ -81,7 +81,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
 }
 
 Bool
-fbOverlayCloseScreen(int iScreen, ScreenPtr pScreen)
+fbOverlayCloseScreen(ScreenPtr pScreen)
 {
     FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
     int i;
diff --git a/xorg-server/fb/fboverlay.h b/xorg-server/fb/fboverlay.h
index 76198cda5..9a93457c7 100644
--- a/xorg-server/fb/fboverlay.h
+++ b/xorg-server/fb/fboverlay.h
@@ -63,7 +63,7 @@ extern _X_EXPORT Bool
  fbOverlayCreateWindow(WindowPtr pWin);
 
 extern _X_EXPORT Bool
- fbOverlayCloseScreen(int iScreen, ScreenPtr pScreen);
+ fbOverlayCloseScreen(ScreenPtr pScreen);
 
 extern _X_EXPORT int
  fbOverlayWindowLayer(WindowPtr pWin);
diff --git a/xorg-server/fb/fbscreen.c b/xorg-server/fb/fbscreen.c
index c0903ec5c..0833cd41e 100644
--- a/xorg-server/fb/fbscreen.c
+++ b/xorg-server/fb/fbscreen.c
@@ -27,7 +27,7 @@
 #include "fb.h"
 
 Bool
-fbCloseScreen(int index, ScreenPtr pScreen)
+fbCloseScreen(ScreenPtr pScreen)
 {
     int d;
     DepthPtr depths = pScreen->allowedDepths;