[xserver-commit] xserver/fb Makefile.am,1.3.2.1,1.3.2.2 fbcmap.c,1.8,1.8.2.1 fboverlay.c,1.6,1.6.2.1

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/fb
In directory pdx:/tmp/cvs-serv21043/fb

Modified Files:
      Tag: xfixes_2_branch
	Makefile.am fbcmap.c fboverlay.c 
Log Message:
	* Xext/shm.c: (ShmRegisterFbFuncs):
	* Xext/shmint.h:
	* dix/window.c: (SetWinSize), (SetBorderSize):
	* fb/Makefile.am:
	* fb/fbcmap.c:
	* fb/fboverlay.c:
	* include/windowstr.h:
	* mi/mivaltree.c: (miComputeClips):
	Move MIT-SHM server declarations to shmint.h
	Start APPORTION dix hooks
	Comment out fbHasVisualTypes as it appears unused


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/fb/Makefile.am,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- Makefile.am	25 Oct 2003 06:10:47 -0000	1.3.2.1
+++ Makefile.am	31 Oct 2003 21:48:09 -0000	1.3.2.2
@@ -1,5 +1,6 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/mi			\
+	-I$(top_srcdir)/Xext			\
 	-I$(top_srcdir)/render			\
 	@XSERVER_CFLAGS@
 

Index: fbcmap.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbcmap.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- fbcmap.c	11 Sep 2003 05:12:50 -0000	1.8
+++ fbcmap.c	31 Oct 2003 21:48:09 -0000	1.8.2.1
@@ -411,6 +411,7 @@
     return TRUE;
 }
 
+#ifdef NOTUSED
 Bool
 fbHasVisualTypes (int depth)
 {
@@ -421,6 +422,7 @@
 	    return TRUE;
     return FALSE;
 }
+#endif
 
 Bool
 fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)

Index: fboverlay.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fboverlay.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- fboverlay.c	11 Sep 2003 05:12:50 -0000	1.6
+++ fboverlay.c	31 Oct 2003 21:48:09 -0000	1.6.2.1
@@ -28,6 +28,7 @@
 #endif
 #include "fb.h"
 #include "fboverlay.h"
+#include "shmint.h"
 
 int	fbOverlayGeneration;
 int	fbOverlayScreenPrivateIndex = -1;