*** common/screen.h.orig	Wed Mar 23 14:43:44 1994
--- common/screen.h	Tue Mar 29 18:41:26 1994
***************
*** 34,39 ****
--- 34,46 ----
   */
  
  /*
+  * AIX has the fd_set declaration in sys/select.h
+  */
+ #ifdef _AIX
+ #include <sys/select.h>
+ #endif
+ 
+ /*
   * There are minimum values that vi has to have to display a screen.  The
   * row minimum is fixed at 1 line for the text, and 1 line for any error
   * messages.  The column calculation is a lot trickier.  For example, you
*** ex/ex_tag.c.orig	Tue Mar 22 12:24:23 1994
--- ex/ex_tag.c	Tue Mar 29 19:05:56 1994
***************
*** 39,44 ****
--- 39,45 ----
  #endif /* not lint */
  
  #include <sys/param.h>
+ #include <sys/types.h>
  #include <sys/mman.h>
  #include <sys/queue.h>
  #include <sys/stat.h>
*** PORT/db/hash/hash.h.orig	Thu May 26 14:08:24 1994
--- PORT/db/hash/hash.h	Thu May 26 14:09:09 1994
***************
*** 260,265 ****
--- 260,273 ----
  #define FULL_KEY_DATA	3
  #define	REAL_KEY	4
  
+ #ifdef BSIZE
+ #undef BSIZE
+ #endif
+ 
+ #ifdef BSHIFT
+ #undef BSHIFT
+ #endif
+ 
  /* Short hands for accessing structure */
  #define BSIZE		hdr.bsize
  #define BSHIFT		hdr.bshift
*** sex/sex_refresh.c.orig	Fri May 27 14:27:38 1994
--- sex/sex_refresh.c	Fri May 27 14:26:42 1994
***************
*** 56,61 ****
--- 56,69 ----
  #include "sex_screen.h"
  
  #ifndef SYSV_CURSES
+ #ifdef A_NORMAL
+ #undef A_NORMAL
+ #endif
+ 
+ #ifdef A_STANDOUT
+ #undef A_STANDOUT
+ #endif
+ 
  #define	A_NORMAL	1
  #define	A_STANDOUT	2
  #define	vidattr(attr)	Xvidattr(sp, attr)