===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/def.h,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- src/usr.bin/mg/def.h	2015/03/16 13:47:48	1.142
+++ src/usr.bin/mg/def.h	2015/03/19 21:22:15	1.143
@@ -1,4 +1,4 @@
-/*	$OpenBSD: def.h,v 1.142 2015/03/16 13:47:48 bcallah Exp $	*/
+/*	$OpenBSD: def.h,v 1.143 2015/03/19 21:22:15 bcallah Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -10,9 +10,8 @@
  * per-terminal definitions are in special header files.
  */
 
-#include	"sysdef.h"	/* Order is critical.		 */
-#include	"ttydef.h"
 #include	"chrdef.h"
+#include	"ttydef.h"
 
 typedef int	(*PF)(int, int);	/* generally useful type */
 
@@ -108,6 +107,12 @@
 #define MAX_TOKEN 64
 
 /*
+ * Previously from sysdef.h
+ */
+typedef int	RSIZE;		/* Type for file/region sizes    */
+typedef short	KCHAR;		/* Type for internal keystrokes  */
+
+/*
  * This structure holds the starting position
  * (as a line/offset pair) and the number of characters in a
  * region of a buffer. This makes passing the specification
@@ -233,6 +238,17 @@
 
 struct undo_rec;
 TAILQ_HEAD(undoq, undo_rec);
+
+/*
+ * Previously from sysdef.h
+ * Only used in struct buffer.
+ */
+struct fileinfo {
+        uid_t           fi_uid;
+        gid_t           fi_gid;
+        mode_t          fi_mode;
+        struct timespec fi_mtime;       /* Last modified time */
+};
 
 /*
  * Text is kept in buffers. A buffer header, described