fix ENAMETOOLONG and ENOTEMPTY may already be defined in errno.h

diff --git a/ares/setup_once.h b/ares/setup_once.h
index 6daf9d8b7760f442f076ea3d34ce718fdbb088c8..41b42e9008e2b4a98c3d58bdc4fe71f4af1622b5 100644 (file)
--- a/ares/setup_once.h
+++ b/ares/setup_once.h
@@ -27,6 +27,13 @@
  ********************************************************************/
 
 
+/*
+ * Inclusion of common header files.
+ */
+
+#include <errno.h>
+
+
 /*
  * If we have the MSG_NOSIGNAL define, make sure we use
  * it as the fourth argument of function send()
@@ -219,10 +226,14 @@ typedef int sig_atomic_t;
 #define ETIMEDOUT        WSAETIMEDOUT
 #define ECONNREFUSED     WSAECONNREFUSED
 #define ELOOP            WSAELOOP
+#ifndef ENAMETOOLONG     /* possible previous definition in errno.h */
 #define ENAMETOOLONG     WSAENAMETOOLONG
+#endif
 #define EHOSTDOWN        WSAEHOSTDOWN
 #define EHOSTUNREACH     WSAEHOSTUNREACH
+#ifndef ENOTEMPTY        /* possible previous definition in errno.h */
 #define ENOTEMPTY        WSAENOTEMPTY
+#endif
 #define EPROCLIM         WSAEPROCLIM
 #define EUSERS           WSAEUSERS
 #define EDQUOT           WSAEDQUOT

diff --git a/lib/setup_once.h b/lib/setup_once.h
index 630cd05e3853ee191fd9479500f827515cac9dc9..2cf4ebea40995496a256c7037533eda490c5757b 100644 (file)
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -34,6 +34,13 @@
  ********************************************************************/
 
 
+/*
+ * Inclusion of common header files.
+ */
+
+#include <errno.h>
+
+
 /*
  * If we have the MSG_NOSIGNAL define, make sure we use
  * it as the fourth argument of function send()
@@ -226,10 +233,14 @@ typedef int sig_atomic_t;
 #define ETIMEDOUT        WSAETIMEDOUT
 #define ECONNREFUSED     WSAECONNREFUSED
 #define ELOOP            WSAELOOP
+#ifndef ENAMETOOLONG     /* possible previous definition in errno.h */
 #define ENAMETOOLONG     WSAENAMETOOLONG
+#endif
 #define EHOSTDOWN        WSAEHOSTDOWN
 #define EHOSTUNREACH     WSAEHOSTUNREACH
+#ifndef ENOTEMPTY        /* possible previous definition in errno.h */
 #define ENOTEMPTY        WSAENOTEMPTY
+#endif
 #define EPROCLIM         WSAEPROCLIM
 #define EUSERS           WSAEUSERS
 #define EDQUOT           WSAEDQUOT