Date: Sun, 19 Jul 1998 18:35:28 +0300 (IDT)
From: Eli Zaretskii <eliz AT is DOT elta DOT co DOT il>
To: DJ Delorie <dj AT delorie DOT com>
cc: djgpp-workers AT delorie DOT com
Subject: Correction for conio.c
Message-ID: <Pine.SUN.3.91.980719183442.1110B-100000@is>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Precedence: bulk

*** src/libc/pc_hw/co80/conio.c~0	Sun Aug 31 12:13:34 1997
--- src/libc/pc_hw/co80/conio.c	Sat Jul 18 18:00:46 1998
*************** set_scan_lines_and_font(int scan_lines, 
*** 863,869 ****
  static void
  maybe_create_8x10_font(void)
  {
-   unsigned char *p;
    unsigned long src, dest, i, j;
  
    if (font_seg == -1)
--- 863,868 ----
*************** maybe_create_8x10_font(void)
*** 878,891 ****
          return;
  
        /* Get the pointer to the 8x8 font table.  */
-       p = (unsigned char *)malloc(2560); /* 256 chars X 8x10 pixels */
-       if (p == (unsigned char *)0)
-         {
-           errno = ENOMEM;
-           __dpmi_free_dos_memory(buf_pm_sel);
-           font_seg = -1;
-           return;
-         }
        regs.h.bh = 3;
        regs.x.ax = 0x1130;
        __dpmi_int(0x10, &regs);
--- 877,882 ----
*************** gppconio_init(void)
*** 1037,1042 ****
--- 1028,1034 ----
        conio_count = __bss_count;
        oldattrib = -1;
        last_mode = 0xffff;
+       font_seg = -1;
      }
  
    (void)isEGA();    /* sets the global ADAPTER_TYPE */