4 files changed, 7 insertions, 1 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index df6a42595ad..8cb9594d4d0 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,6 +1,7 @@
 2012-12-08  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/ms-w32.h (putenv): Redirect to sys_putenv.
+        (sys_putenv): Add prototype.
 
         * config.nt (HAVE_UNSETENV): Define to 1.
 
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 1cbcb7f88f3..3d68efb804d 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -381,6 +381,7 @@ extern char *get_emacs_configuration_options (void);
 # undef putenv
 #endif
 #define putenv    sys_putenv
+extern int sys_putenv (char *);
 
 extern int getloadavg (double *, int);
 extern int getpagesize (void);
diff --git a/src/ChangeLog b/src/ChangeLog
index 0be3eee6726..222be9575b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (unsetenv): Return 0 if the input string is too long.
+
 2012-12-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use putenv+unsetenv instead of modifying environ directly (Bug#13070).
diff --git a/src/w32.c b/src/w32.c
index 203c5cd40ff..b6bb653369d 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1562,7 +1562,7 @@ unsetenv (const char *name)
   if (name_len > 32767)
     {
       errno = ENOMEM;
-      return -1;
+      return 0;
     }
   /* It is safe to use 'alloca' with 32K size, since the stack is at
      least 2MB, and we set it to 8MB in the link command line.  */