Merge from trunk

5 files changed, 16 insertions, 15 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index e55fc52a487..a0603fd7c26 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,18 @@
+2011-03-27  Glenn Morris  <rgm@gnu.org>
+
+        * config.nt: Remove RETSIGTYPE, SIGTYPE (identical to void).
+
+2011-03-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * addpm.c (main): Remove unused variable `retval'.
+
+        * preprep.c (main): Remove unused variable `ptr'.
+
+2011-03-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * cmdproxy.c: Include <ctype.h>.
+        (make_absolute): Remove unused variable `i'.
+
 2011-02-27  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/unistd.h (readlink, symlink): Declare prototypes.
diff --git a/nt/addpm.c b/nt/addpm.c
index c2cd1a07abc..d7919d36f80 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -274,8 +274,6 @@ main (int argc, char *argv[])
     {
       if (strlen (start_folder) < (MAX_PATH - 20))
         {
-          BOOL retval;
-
           strcat (start_folder, "\\Gnu Emacs");
           if (CreateDirectory (start_folder, NULL)
               || GetLastError () == ERROR_ALREADY_EXISTS)
@@ -307,8 +305,6 @@ main (int argc, char *argv[])
       /* Ensure there is enough room for "...\GNU Emacs\Emacs.lnk".  */
       if (strlen (start_folder) < (MAX_PATH - 20))
         {
-          BOOL retval;
-
           strcat (start_folder, "\\Gnu Emacs");
           if (CreateDirectory (start_folder, NULL)
               || GetLastError () == ERROR_ALREADY_EXISTS)
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 9a98e1e5034..b9572570c5f 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -33,6 +33,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <malloc.h>  /* alloca */
 #include <stdlib.h>  /* getenv */
 #include <string.h>  /* strlen */
+#include <ctype.h>   /* isspace, isalpha */
 
 /* We don't want to include stdio.h because we are already duplicating
    lots of it here */
@@ -251,7 +252,6 @@ make_absolute (const char *prog)
   char curdir[MAX_PATH];
   char *p, *path;
   const char *fname;
-  int i;
 
   /* At least partial absolute path specified; search there.  */
   if ((isalpha (prog[0]) && prog[1] == ':') ||
diff --git a/nt/config.nt b/nt/config.nt
index 26fbc1c67c5..1d9a5faaf2c 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -393,15 +393,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef STACK_DIRECTION
 #endif
 
-/* Define the return type of signal handlers if the s-xxx file
-   did not already do so.  */
-#define RETSIGTYPE void
-
-/* SIGTYPE is the macro we actually use.  */
-#ifndef SIGTYPE
-#define SIGTYPE RETSIGTYPE
-#endif
-
 #ifdef emacs /* Don't do this for lib-src.  */
 /* Tell regex.c to use a type compatible with Emacs.  */
 #define RE_TRANSLATE_TYPE Lisp_Object
diff --git a/nt/preprep.c b/nt/preprep.c
index 513ad14e966..6b764afdeab 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -765,7 +765,6 @@ main (int argc, char **argv)
   PIMAGE_NT_HEADERS nt_header;
   file_data in_file, out_file;
   char out_filename[MAX_PATH], in_filename[MAX_PATH];
-  const char *ptr;
 
   strcpy (in_filename, argv[1]);
   strcpy (out_filename, argv[2]);