2 files changed, 13 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4502365a7aa..cb01d728cff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * process.c [WINDOWSNT]: Undef AF_INET6 to disable IPv6 support
+        for w32.
+
 2006-01-04  Kim F. Storm  <storm@cua.dk>
 
         * process.c: Add IPv6 support.
diff --git a/src/process.c b/src/process.c
index c842b798c43..3dfbf969c30 100644
--- a/src/process.c
+++ b/src/process.c
@@ -118,6 +118,14 @@ Boston, MA 02110-1301, USA.  */
 #include <sys/wait.h>
 #endif
 
+/* Disable IPv6 support for w32 until someone figures out how to do it
+   properly.  */
+#ifdef WINDOWSNT
+# ifdef AF_INET6
+#  undef AF_INET6
+# endif
+#endif
+
 #include "lisp.h"
 #include "systime.h"
 #include "systty.h"