From af218174d9c08a4687ecb3840919de8d439e933f Mon Sep 17 00:00:00 2001
From: asami <asami@FreeBSD.org>
Date: Fri, 25 Apr 1997 11:10:52 +0000
Subject: Move the existing (unconditional) <sys/types.h> include above the
 conditional include of <utmp.h>.

---
 x11/rxvt-unicode/files/patch-ab | 23 +++++++++++++++--------
 x11/rxvt/files/patch-ab         | 23 +++++++++++++++--------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/x11/rxvt-unicode/files/patch-ab b/x11/rxvt-unicode/files/patch-ab
index 9497eb28e985..4b6d96b4720a 100644
--- a/x11/rxvt-unicode/files/patch-ab
+++ b/x11/rxvt-unicode/files/patch-ab
@@ -1,12 +1,19 @@
 --- ./src/utmp.c.org	Thu Jan 23 10:46:02 1997
 +++ ./src/utmp.c	Thu Apr 24 15:20:49 1997
-@@ -84,6 +84,9 @@
+@@ -80,6 +80,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++
+ #ifdef HAVE_UTMPX_H
  # include <utmpx.h>
  # define USE_SYSV_UTMP
- #else
-+# if defined(__FreeBSD__) && __FreeBSD__ >= 3
-+#  include <sys/types.h>
-+# endif
- # include <utmp.h>
- # ifdef HAVE_SETUTENT
- #  define USE_SYSV_UTMP
+@@ -90,7 +92,6 @@
+ # endif
+ #endif
+ 
+-#include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #ifdef TIME_WITH_SYS_TIME
diff --git a/x11/rxvt/files/patch-ab b/x11/rxvt/files/patch-ab
index 9497eb28e985..4b6d96b4720a 100644
--- a/x11/rxvt/files/patch-ab
+++ b/x11/rxvt/files/patch-ab
@@ -1,12 +1,19 @@
 --- ./src/utmp.c.org	Thu Jan 23 10:46:02 1997
 +++ ./src/utmp.c	Thu Apr 24 15:20:49 1997
-@@ -84,6 +84,9 @@
+@@ -80,6 +80,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++
+ #ifdef HAVE_UTMPX_H
  # include <utmpx.h>
  # define USE_SYSV_UTMP
- #else
-+# if defined(__FreeBSD__) && __FreeBSD__ >= 3
-+#  include <sys/types.h>
-+# endif
- # include <utmp.h>
- # ifdef HAVE_SETUTENT
- #  define USE_SYSV_UTMP
+@@ -90,7 +92,6 @@
+ # endif
+ #endif
+ 
+-#include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #ifdef TIME_WITH_SYS_TIME
-- 
cgit