diff options
| author | Danilo Almeida <dalmeida@mit.edu> | 2002-04-11 03:19:07 +0000 |
|---|---|---|
| committer | Danilo Almeida <dalmeida@mit.edu> | 2002-04-11 03:19:07 +0000 |
| commit | 117bdd833185111bb6681b990acc4cb639bbd921 (patch) | |
| tree | 22a0287f06be936d39596b6f34f3c890ef13edf5 /src/include | |
| parent | f7b3eeea03adf58e3f9e734320f38d4ae3581dfd (diff) | |
| download | krb5-117bdd833185111bb6681b990acc4cb639bbd921.tar.gz krb5-117bdd833185111bb6681b990acc4cb639bbd921.tar.xz krb5-117bdd833185111bb6681b990acc4cb639bbd921.zip | |
* krb.h: Do not include winsock.h for Win32, since we already use
port-sockets.h. This avoids winsock.h vs winsock2.h issues.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14378 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/kerberosIV/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/kerberosIV/krb.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog index 896a07faa0..96700cfdf2 100644 --- a/src/include/kerberosIV/ChangeLog +++ b/src/include/kerberosIV/ChangeLog @@ -1,3 +1,8 @@ +2002-04-10 Danilo Almeida <dalmeida@mit.edu> + + * krb.h: Do not include winsock.h for Win32, since we already use + port-sockets.h. This avoids winsock.h vs winsock2.h issues. + 2002-03-11 Ken Raeburn <raeburn@mit.edu> * lsb_addr_cmp.h (krb4int_address_less): Declare. diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h index cec73ef231..ed90e0711d 100644 --- a/src/include/kerberosIV/krb.h +++ b/src/include/kerberosIV/krb.h @@ -34,7 +34,6 @@ #include <kerberosIV/des.h> #ifdef _WINDOWS -#include <winsock.h> #include <time.h> #endif /* _WINDOWS */ |