# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1196430987 0
# Node ID 51288a744d1c6f053f900c30891456250c7b926c
# Parent  9dc4e1851a7d48fda991b336500359721edeba4d
(map_tty_color, tty_color_name): Remove special case for WINDOWSNT.

diff -r 9dc4e1851a7d -r 51288a744d1c src/xfaces.c
--- a/src/xfaces.c	Fri Nov 30 09:01:17 2007 +0000
+++ b/src/xfaces.c	Fri Nov 30 13:56:27 2007 +0000
@@ -1463,10 +1463,6 @@
   if (idx == FACE_TTY_DEFAULT_BG_COLOR)
     return build_string (unspecified_bg);
 
-#ifdef WINDOWSNT
-  return vga_stdcolor_name (idx);
-#endif
-
   return Qunspecified;
 }
 
@@ -7464,13 +7460,11 @@
     {
       pixel = load_color (f, face, color, idx);
 
-#if defined (MSDOS) || defined (WINDOWSNT)
+#ifdef MSDOS
       /* If the foreground of the default face is the default color,
 	 use the foreground color defined by the frame.  */
-#ifdef MSDOS
       if (FRAME_MSDOS_P (f))
 	{
-#endif /* MSDOS */
 	  if (pixel == default_pixel
 	      || pixel == FACE_TTY_DEFAULT_COLOR)
 	    {
@@ -7490,10 +7484,8 @@
 	      face->lface[idx] = tty_color_name (f, pixel);
 	      *defaulted = 1;
 	    }
-#ifdef MSDOS
-	}
-#endif
-#endif /* MSDOS or WINDOWSNT */
+        }
+#endif /* MSDOS */
     }
 
   if (foreground_p)