--- OLD/xc/programs/Xserver/cfb/cfbmap.h	Thu Jan  1 00:00:00 1970
+++ NEW/xc/programs/Xserver/cfb/cfbmap.h	Thu Jan  1 00:00:00 1970
@@ -26,9 +26,10 @@
  * Map names around so that multiple depths can be supported simultaneously
  */
 
+#if PSZ != 8
+
 /* a losing vendor cpp dumps core if we define NAME in terms of CATNAME */
 
-#if PSZ != 8
 #if PSZ == 32
 #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define NAME(subname) cfb32##subname
@@ -50,6 +51,14 @@
 #define NAME(subname) cfb4##subname
 #else
 #define NAME(subname) cfb4/**/subname
+#endif
+#endif
+
+#if PSZ == 2
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#define NAME(subname) cfb2##subname
+#else
+#define NAME(subname) cfb2/**/subname
 #endif
 #endif