diff src/w32console.c @ 13424:efbbbfd268dd

(nt_ring_bell): Renamed from ring_bell, now global. (initialize_win_nt_display): Use nt_ring_bell. [HAVE_NTGUI] (pixel_to_glyph_coords, glyph_to_pixel_coords): Don't define.

--- a/src/w32console.c	Tue Nov 07 07:34:42 1995 +0000
+++ b/src/w32console.c	Tue Nov 07 07:35:06 1995 +0000
@@ -57,7 +57,7 @@
 static void insert_glyphs (GLYPH *start, int len);
 static void write_glyphs (GLYPH *string, int len);
 static void delete_glyphs (int n);
-static void ring_bell (void);
+void nt_ring_bell (void);
 static void reset_terminal_modes (void);
 static void set_terminal_modes (void);
 static void set_terminal_window (int size);
@@ -367,8 +367,10 @@
 	  continue;
 	}
       GLYPH_FOLLOW_ALIASES (glyph_table, glyph_len, glyph);
+#ifndef HAVE_NTGUI
       if (GLYPH_FACE (fixfix, glyph) != 0)
 	printf ("Glyph face is %d\n", GLYPH_FACE (fixfix, glyph));
+#endif /* !HAVE_NTGUI */
       if (GLYPH_SIMPLE_P (glyph_table, glyph_len, glyph))
         {
 	  *ptr++ = glyph & 0xFF;
@@ -418,7 +420,7 @@
 static unsigned int sound_type = 0xFFFFFFFF;
 
 void
-ring_bell (void)
+nt_ring_bell (void)
 {
   if (sound_type == 0xFFFFFFFF) 
       Beep (666, 100);
@@ -551,7 +553,7 @@
   insert_glyphs_hook		= (term_hook) insert_glyphs;
   write_glyphs_hook		= (term_hook) write_glyphs;
   delete_glyphs_hook		= (term_hook) delete_glyphs;
-  ring_bell_hook		= (term_hook) ring_bell;
+  ring_bell_hook		= (term_hook) nt_ring_bell;
   reset_terminal_modes_hook	= (term_hook) reset_terminal_modes;
   set_terminal_modes_hook	= (term_hook) set_terminal_modes;
   set_terminal_window_hook	= (term_hook) set_terminal_window;
@@ -606,6 +608,7 @@
   return Qt;
 }
 
+#ifndef HAVE_NTGUI
 void
 pixel_to_glyph_coords (FRAME_PTR f, int pix_x, int pix_y, int *x, int *y,
 		      void *bounds, int noclip)
@@ -620,6 +623,7 @@
   *pix_x = x;
   *pix_y = y;
 }
+#endif /* !HAVE_NTGUI */
 
 void
 syms_of_ntterm ()