This file contains last-minute bug fixes which didn't make it into
XFree86 3.1.1.

------------------------------------------------------------------------

This fix consists of three patches for use when building XFree86 3.1.1
with ISC SVR3.  The first fixes a problem compiling xsm.  The second
works around problems when compiling Motif clients.  The third fixes
a problem with the install script.

------------------------------------------------------------------------

*** xc/workInProgress/xsm/xsm.h-3.1.1	1995/01/27 10:38:33
--- xc/workInProgress/xsm/xsm.h	1995/01/31 09:46:37
***************
*** 49,58 ****
  #endif
  #endif /* PATH_MAX */
  
- /* Fix ISC brain damage.  When using gcc fdopen isn't declared in <stdio.h>. */
- #if defined(__STDC__) && defined(ISC)
- extern FILE *fdopen(int, char const *);
- #endif
  #ifndef _POSIX_SOURCE
  #define _POSIX_SOURCE
  #include <stdio.h>
--- 49,54 ----
***************
*** 186,192 ****
  #endif
  
  /* Fix ISC brain damage.  When using gcc fdopen isn't declared in <stdio.h>. */
! #if defined(ISC) && __STDC__
  extern FILE *fdopen(int, char const *);
  #endif
  
--- 182,188 ----
  #endif
  
  /* Fix ISC brain damage.  When using gcc fdopen isn't declared in <stdio.h>. */
! #if defined(ISC) && __STDC__ && !defined(ISC30)
  extern FILE *fdopen(int, char const *);
  #endif
  
*** xc/lib/X11/Xlib.h-3.1.1	1994/09/17 13:44:15
--- xc/lib/X11/Xlib.h	1995/01/31 09:42:59
***************
*** 62,68 ****
--- 62,70 ----
  #ifndef X_WCHAR
  #ifdef X_NOT_STDC_ENV
  #ifndef SCO324
+ #ifndef ISC
  #define X_WCHAR
+ #endif
  #endif
  #endif
  #endif
*** xc/programs/Xserver/hw/xfree86/etc/install.sv3-3.1.1	1995/01/28 16:03:57
--- xc/programs/Xserver/hw/xfree86/etc/install.sv3	1995/01/31 09:44:33
***************
*** 150,155 ****
--- 150,157 ----
   }'  </etc/conf/cf.d/mdevice.old >/etc/conf/cf.d/mdevice
  rm /etc/conf/cf.d/mdevice.old
  
+ HAS_PTC=`grep "PTC_UNITS > 32" /etc/conf/node.d/pty`
+ [ "$HAS_PTC" = "" ] && {
  echo "pty	ptyq0	c	16
  pty	ptyq1	c	17
  pty	ptyq2	c	18
***************
*** 166,172 ****
--- 168,177 ----
  pty	ptyqd	c	29
  pty	ptyqe	c	30
  pty	ptyqf	c	31" >>/etc/conf/node.d/pty
+ }
  
+ HAS_PTX=`grep "PTX_UNITS > 32" /etc/conf/node.d/ptx`
+ [ "$HAS_PTX" = "" ] && {
  echo "ptx	ttyq0	c	16
  ptx	ttyq1	c	17
  ptx	ttyq2	c	18
***************
*** 183,188 ****
--- 188,194 ----
  ptx	ttyqd	c	29
  ptx	ttyqe	c	30
  ptx	ttyqf	c	31" >>/etc/conf/node.d/ptx
+ }
  
  fi
  
------------------------------------------------------------------------

This patch fixes a font cache problem with the Mach32 server that shows
up on boards with more than 1MB of video memory.

Note that it is possible to work around this problem without using
this patch by setting the Videoram value in the Device section of the
XF86Config file to (VirtualX * 1536)/1024 if this value is less than 2048.

------------------------------------------------------------------------

*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h-3.1.1	1995/01/28 16:58:27
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h	1995/02/02 10:54:22
***************
*** 29,35 ****
  #ifndef MACH32_H
  #define MACH32_H
  
! #define MACH32_PATCHLEVEL "0"
  
  #define MACH32_CURSBYTES	1024
  #define MACH32_CURSMAX		64
--- 29,35 ----
  #ifndef MACH32_H
  #define MACH32_H
  
! #define MACH32_PATCHLEVEL "1"
  
  #define MACH32_CURSBYTES	1024
  #define MACH32_CURSMAX		64
*** xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c-3.1.1	1995/01/28 16:58:50
--- xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c	1995/02/02 10:53:50
***************
*** 71,88 ****
  mach32FontCache8Init()
  {
     static int first = TRUE;
-    int free_ram;
     int x, y, w, h;
     int BitPlane;
     CachePool FontPool;
  
-    /* free_ram accounts for the cursor space */
-    free_ram = mach32InfoRec.videoRam * 1024 -
- 	(mach32InfoRec.virtualX * mach32InfoRec.virtualY * 
- 	(mach32InfoRec.bitsPerPixel / 8));
     x = 0;
     y = mach32InfoRec.virtualY;
!    h = free_ram / (mach32InfoRec.virtualX * (mach32InfoRec.bitsPerPixel / 8));
     w = mach32InfoRec.virtualX - PIXMAP_WIDTH;
  
     if (mach32InfoRec.bitsPerPixel == 8) {
--- 71,83 ----
  mach32FontCache8Init()
  {
     static int first = TRUE;
     int x, y, w, h;
     int BitPlane;
     CachePool FontPool;
  
     x = 0;
     y = mach32InfoRec.virtualY;
!    h = mach32MaxY + 1 - mach32InfoRec.virtualY;
     w = mach32InfoRec.virtualX - PIXMAP_WIDTH;
  
     if (mach32InfoRec.bitsPerPixel == 8) {

------------------------------------------------------------------------