summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiro Jurisic <meeroh@mit.edu>1999-11-22 22:58:02 +0000
committerMiro Jurisic <meeroh@mit.edu>1999-11-22 22:58:02 +0000
commit2bd37be8b04977f8fc9bbdefffc1f2ebe89db1f7 (patch)
treee9e45d61bf5df29fce38b2465e02b1e5bd53133d /src
parent1aa0a3d4013f06a4cda7eeb407664da867818332 (diff)
downloadkrb5-2bd37be8b04977f8fc9bbdefffc1f2ebe89db1f7.tar.gz
krb5-2bd37be8b04977f8fc9bbdefffc1f2ebe89db1f7.tar.xz
krb5-2bd37be8b04977f8fc9bbdefffc1f2ebe89db1f7.zip
MacOS: only #define MAXHOSTNAMELEN when not already defined
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11908 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-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 */