From c723a928778be55849c00d5cc692bf522bb8dae3 Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Mon, 20 Jul 2009 06:39:06 +0000
Subject: Assorted minor cleanups, no functional change:    - u_int* -> uint*  
  - don't make private typedefs of system structures    - use curses TRUE and
 FALSE only with curses booleans, otherwise      true and false;    - includes
 cleanup    - group globals in extern.c by functionality

Object file diffs inspected.
---
 robots/robots.h | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'robots/robots.h')

diff --git a/robots/robots.h b/robots/robots.h
index 2e81ef22..1da54fd4 100644
--- a/robots/robots.h
+++ b/robots/robots.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: robots.h,v 1.20 2009/07/20 06:00:56 dholland Exp $	*/
+/*	$NetBSD: robots.h,v 1.21 2009/07/20 06:39:06 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -31,20 +31,11 @@
  *	@(#)robots.h	8.1 (Berkeley) 5/31/93
  */
 
-#include <sys/ttydefaults.h>
-#include <sys/endian.h>
-#include <ctype.h>
-#include <curses.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <pwd.h>
+#include <sys/cdefs.h>
+
 #include <setjmp.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 /*
  * miscellaneous constants
@@ -84,15 +75,13 @@ typedef struct {
 } COORD;
 
 typedef struct {
-	u_int32_t s_uid;
-	u_int32_t s_score;
-	u_int32_t s_auto;
-	u_int32_t s_level;
+	uint32_t s_uid;
+	uint32_t s_score;
+	uint32_t s_auto;
+	uint32_t s_level;
 	char s_name[MAXNAME];
 } SCORE;
 
-typedef struct passwd PASSWD;
-
 /*
  * global variables
  */
@@ -110,7 +99,7 @@ extern const char *Next_move, *Move_list;
 extern int Count, Level, Num_robots, Num_scrap, Num_scores,
 	Start_level, Wait_bonus, Num_games;
 
-extern u_int32_t Score;
+extern uint32_t Score;
 
 extern COORD Max, Min, My_pos, Robots[], Scrap[];
 
-- 
cgit v1.2.3