===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/includes.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src/usr.bin/ssh/Attic/includes.h	1999/09/30 05:03:04	1.5
+++ src/usr.bin/ssh/Attic/includes.h	1999/09/30 05:19:57	1.6
@@ -13,7 +13,7 @@
 
 */
 
-/* RCSID("$Id: includes.h,v 1.5 1999/09/30 05:03:04 deraadt Exp $"); */
+/* RCSID("$Id: includes.h,v 1.6 1999/09/30 05:19:57 deraadt Exp $"); */
 
 #ifndef INCLUDES_H
 #define INCLUDES_H
@@ -21,91 +21,47 @@
 /* Note: autoconf documentation tells to use the <...> syntax and have -I. */
 #include <config.h>
 
-#include "version.h"
-
-typedef unsigned short word16;
-
-#if SIZEOF_LONG == 4
-typedef unsigned long word32;
-#else
-#if SIZEOF_INT == 4
-typedef unsigned int word32;
-#else
-#if SIZEOF_SHORT >= 4
-typedef unsigned short word32;
-#else
-YOU_LOSE
-#endif
-#endif
-#endif
-
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
 #include <sys/param.h>
-#include <machine/endian.h>
-#include <netgroup.h>
+#include <sys/ioctl.h>
+#include <sys/endian.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <sys/un.h>
+#include <sys/resource.h>
 
+#include <netgroup.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <assert.h>
 #include <signal.h>
 
-#include <sys/ioctl.h>
-
 #include <termios.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
-#include <sys/un.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <sys/select.h>
 
 #include <pwd.h>
 #include <grp.h>
-
-#include <sys/wait.h>
-
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-
-#include <sys/time.h>
 #include <time.h>
-
 #include <paths.h>
 
-#if HAVE_DIRENT_H
 #include <dirent.h>
-#define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-#define dirent direct
-#define NAMLEN(dirent) (dirent)->d_namlen
-#if HAVE_SYS_NDIR_H
-#include <sys/ndir.h>
-#endif
-#if HAVE_SYS_DIR_H
-#include <sys/dir.h>
-#endif
-#if HAVE_NDIR_H
-#include <ndir.h>
-#endif
-#endif
 
-#include <sys/resource.h>
-
-#if USE_STRLEN_FOR_AF_UNIX
-#define AF_UNIX_SIZE(unaddr) \
-  (sizeof((unaddr).sun_family) + strlen((unaddr).sun_path) + 1)
-#else
 #define AF_UNIX_SIZE(unaddr) sizeof(unaddr)
-#endif
+
+#include "version.h"
 
 #endif /* INCLUDES_H */