summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/util/pty/ChangeLog5
-rw-r--r--src/util/pty/sane_hostname.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 454f09771..fd3ce53be 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 16 20:18:40 1999 Tom Yu <tlyu@mit.edu>
+
+ * sane_hostname.c: Re-order so that pty-int.h precedes libpty.h to
+ prevent conflicting definitions of struct sockaddr_in
+
Thu Feb 11 22:24:03 1999 Tom Yu <tlyu@mit.edu>
* sane_hostname.c: Force maxlen to be 16 if it's less than 16,
diff --git a/src/util/pty/sane_hostname.c b/src/util/pty/sane_hostname.c
index 6871b3de7..7163b7ec2 100644
--- a/src/util/pty/sane_hostname.c
+++ b/src/util/pty/sane_hostname.c
@@ -17,9 +17,9 @@
*
*/
#include <com_err.h>
-#include <arpa/inet.h>
-#include "libpty.h"
#include "pty-int.h"
+#include "libpty.h"
+#include <arpa/inet.h>
static long
do_ntoa(struct sockaddr_in *addr,