avoid redundant definitions of socket-related error codes for Windows

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14539 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 01ae0342c30e156a075359d73bb57472fd03de38..8a188d635dc473ada25c190cb86eaa77127d33b4 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-18  Ken Raeburn  <raeburn@mit.edu>
+
+       * sendauth.c (ECONNABORTED): Don't define here now that it's
+       defined in port-sockets.h.
+
 2002-06-18  Danilo Almeida  <dalmeida@mit.edu>
 
        * princ_comp.c (krb5_realm_compare), auth_con.c

diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c
index f8117495e0dd25f44d3cc1ada0234ceb50d6b119..084d72ddba3eec6daa32af9326b4f79cc64262aa 100644 (file)
--- a/src/lib/krb5/krb/sendauth.c
+++ b/src/lib/krb5/krb/sendauth.c
@@ -104,9 +104,6 @@ krb5_sendauth(context, auth_context,
         * Now, read back a byte: 0 means no error, 1 means bad sendauth
         * version, 2 means bad application version
         */
-#ifndef ECONNABORTED
-#define ECONNABORTED WSAECONNABORTED
-#endif
     if ((len = krb5_net_read(context, *((int *) fd), (char *)&result, 1)) != 1)
        return((len < 0) ? errno : ECONNABORTED);
     if (result == 1)

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 24a3f0b9880d66867ded6f1c186f8c304aefd00d..3007ba11d512f0a5d691ddfe4b5f0d5135823d7d 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,5 +1,10 @@
 2002-06-18  Ken Raeburn  <raeburn@mit.edu>
 
+       * changepw.c (ECONNABORTED, ECONNREFUSED, EHOSTUNREACH,
+       ETIMEDOUT): Don't define here now that they're defined in
+       port-sockets.h.
+       * read_msg.c (ECONNABORTED): Ditto.
+
        * sendto_kdc.c: Include sys/timeb.h on Windows.
        (ENABLE_TCP): Macro deleted, always enable code.
        (krb5_sendto_kdc): Don't try UDP if outgoing message is 1500

diff --git a/src/lib/krb5/os/changepw.c b/src/lib/krb5/os/changepw.c
index 42b77286e2d4416ab1444431d23a7d019d2fd90a..6ef9badb56e5ea1cf3b060a467a896d6ba56a13b 100644 (file)
--- a/src/lib/krb5/os/changepw.c
+++ b/src/lib/krb5/os/changepw.c
@@ -34,22 +34,6 @@
 #include <stdio.h>
 #include <errno.h>
 
-/* Win32 defines. */
-#if defined(_WIN16) || (defined(_WIN32) && !defined(__CYGWIN32__))
-#ifndef ECONNABORTED
-#define ECONNABORTED WSAECONNABORTED
-#endif
-#ifndef ECONNREFUSED
-#define ECONNREFUSED WSAECONNREFUSED
-#endif
-#ifndef EHOSTUNREACH
-#define EHOSTUNREACH WSAEHOSTUNREACH
-#endif
-#ifndef ETIMEDOUT
-#define ETIMEDOUT WSAETIMEDOUT
-#endif
-#endif /* _WIN32 && !__CYGWIN32__ */
-
 #ifndef GETSOCKNAME_ARG3_TYPE
 #define GETSOCKNAME_ARG3_TYPE int
 #endif

diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c
index c138ffb03c358677cb4abe35e87af6686d9dbcf5..524996fa9f8a96f50897f1ad190e55e9c5cb6126 100644 (file)
--- a/src/lib/krb5/os/read_msg.c
+++ b/src/lib/krb5/os/read_msg.c
@@ -31,10 +31,6 @@
 #include "k5-int.h"
 #include <errno.h>
 
-#ifndef ECONNABORTED
-#define ECONNABORTED WSAECONNABORTED
-#endif
-
 krb5_error_code
 krb5_read_message(context, fdp, inbuf)
     krb5_context context;