From 01326ebada378a58c1797fb5a75f631a70a020e0 Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Mon, 26 Jan 2004 21:40:35 -0800
Subject: [PATCH] [defines.h openbsd-compat/getrrsetbyname.h] Move defines for
 HFIXEDSZ and T_SIG to getrrsetbyname.h

---
 ChangeLog                       |  4 +++-
 defines.h                       | 10 +---------
 openbsd-compat/getrrsetbyname.h |  8 ++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba47af80e..0ba506f59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
  - (tim) [regress/test-exec.sh] RhostsAuthentication is deprecated.
  - (tim) [defines.h] Add defines for HFIXEDSZ and T_SIG
  - (tim) [configure.ac includes.h] add <sys/ptms.h> for grantpt() and friends.
+ - (tim) [defines.h openbsd-compat/getrrsetbyname.h] Move defines for HFIXEDSZ
+   and T_SIG to getrrsetbyname.h
 
 20040124
  - (djm) Typo in openbsd-compat/bsd-openpty.c; from wendyp AT cray.com
@@ -1735,4 +1737,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3191 2004/01/27 03:03:39 tim Exp $
+$Id: ChangeLog,v 1.3192 2004/01/27 05:40:35 tim Exp $
diff --git a/defines.h b/defines.h
index 31bb9a3cb..5e63198e0 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.108 2004/01/27 00:02:17 tim Exp $ */
+/* $Id: defines.h,v 1.109 2004/01/27 05:40:35 tim Exp $ */
 
 
 /* Constants */
@@ -133,14 +133,6 @@ including rpc/rpc.h breaks Solaris 6
 #define __unused
 #endif
 
-#ifndef HFIXEDSZ
-#define HFIXEDSZ 12
-#endif
-
-#ifndef T_SIG
-#define T_SIG 24
-#endif
-
 /* Types */
 
 /* If sys/types.h does not supply intXX_t, supply them ourselves */
diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
index 67937ef5f..39995b63f 100644
--- a/openbsd-compat/getrrsetbyname.h
+++ b/openbsd-compat/getrrsetbyname.h
@@ -58,6 +58,14 @@
 #include <netdb.h>
 #include <resolv.h>
 
+#ifndef HFIXEDSZ
+#define HFIXEDSZ 12
+#endif
+
+#ifndef T_SIG
+#define T_SIG 24
+#endif
+
 /*
  * Flags for getrrsetbyname()
  */