summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/include/krb5/ChangeLog5
-rw-r--r--src/include/krb5/macsock.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 51b4ccbcc7..6fc5cc384b 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-22 Miro Jurisic <meeroh@.mit.edu>
+
+ * macsock.h: MacOS: only #define MACHOSTNAMELEN when not
+ already defined
+
Wed May 19 11:35:18 1999 Danilo Almeida <dalmeida@mit.edu>
* Makefile.in: Create build rules for windows instead of blindly
diff --git a/src/include/krb5/macsock.h b/src/include/krb5/macsock.h
index c34f54b6b6..06b103af3a 100644
--- a/src/include/krb5/macsock.h
+++ b/src/include/krb5/macsock.h
@@ -82,7 +82,9 @@ typedef int SOCKET;
#define SOCKET_EINTR EINTR
#define WSAECONNABORTED kECONNABORTEDErr
+#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN MAXHOSTNAMESIZE
+#endif
#define SOCKET_NFDS(f) (FD_SETSIZE) /* select()'s first arg is maxed out */