Remove ACK EM_WSIZE/EM_PSIZE macro usage

include/arch/i386/include/ansi.h

@@ -52,11 +52,7 @@
 
 #define _BSD_CLOCK_T_		long
 
-#if _EM_PSIZE == _EM_WSIZE
 #define _BSD_PTRDIFF_T_ 	int
-#else /* _EM_PSIZE == _EM_LSIZE */
-#define _BSD_PTRDIFF_T_ 	long
-#endif
 
 #define _BSD_SIZE_T_		unsigned int
 #define	_BSD_SSIZE_T_		int

include/arch/i386/include/signal.h

@@ -33,10 +33,8 @@ struct sigcontext {
   union fpu_state_u sc_fpu_state;
 };
 
-#if _WORD_SIZE == 4
 #define sc_gs sc_regs.gs
 #define sc_fs sc_regs.fs
-#endif /* _WORD_SIZE == 4 */
 #define sc_es sc_regs.es
 #define sc_ds sc_regs.ds
 #define sc_di sc_regs.di

include/minix/ioctl.h

@@ -13,7 +13,6 @@
 #include <minix/types.h>
 #endif
 
-#if _EM_WSIZE >= 4
 /* Ioctls have the command encoded in the low-order word, and the size
  * of the parameter in the high-order word. The 3 high bits of the high-
  * order word are used to encode the in/out/void status of the parameter.
@@ -56,15 +55,6 @@
 #define _MINIX_IOCTL_BIG(i) 		((i) & _IOC_BIG)
 #define _MINIX_IOCTL_SIZE_BIG(i)	(((i) >> 8) & _IOCPARM_MASK_BIG)
 
-#else
-/* No fancy encoding on a 16-bit machine. */
-
-#define _IO(x,y)	((x << 8) | y)
-#define _IOR(x,y,t)	_IO(x,y)
-#define _IOW(x,y,t)	_IO(x,y)
-#define _IORW(x,y,t)	_IO(x,y)
-#endif
-
 __BEGIN_DECLS
 int ioctl(int _fd, int _request, void *_data);
 __END_DECLS

include/minix/sys_config.h

@@ -4,11 +4,6 @@
 /*===========================================================================*
  *		This section contains user-settable parameters		     *
  *===========================================================================*/
-/* Word size in bytes (a constant equal to sizeof(int)). */
-#if __ACK__ || __GNUC__
-#define _WORD_SIZE	_EM_WSIZE
-#define _PTR_SIZE	_EM_WSIZE
-#endif
 
 #define _NR_PROCS	256
 #define _NR_SYS_PROCS	64

include/sys/syslimits.h

@@ -12,11 +12,7 @@
 #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
     defined(_NETBSD_SOURCE)
 
-#if _EM_WSIZE > 2
 #define ARG_MAX 	262144 /* # bytes of args + environ for exec() */
-#else
-#define ARG_MAX 	4096	/* args + environ on small machines */
-#endif
 
 #ifndef CHILD_MAX
 #define	CHILD_MAX	_NO_LIMIT /* max simultaneous processes */