Index: build_w32.bat
===================================================================
RCS file: /sources/make/make/build_w32.bat,v
retrieving revision 2.13
diff -u -p -r2.13 build_w32.bat
--- build_w32.bat	4 Jul 2007 19:35:17 -0000	2.13
+++ build_w32.bat	30 Sep 2007 03:15:30 -0000
@@ -16,7 +16,7 @@ rem
 rem You should have received a copy of the GNU General Public License along
 rem with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if not exist config.h copy config.h.W32 config.h
+if not exist config.h copy config.h.W32.template config.h
 cd w32\subproc
 echo "Creating the subproc library"
 %ComSpec% /c build.bat %1
Index: dir.c
===================================================================
RCS file: /sources/make/make/dir.c,v
retrieving revision 1.66
diff -u -p -r1.66 dir.c
--- dir.c	4 Jul 2007 19:35:18 -0000	1.66
+++ dir.c	30 Sep 2007 03:15:31 -0000
@@ -458,7 +458,7 @@ find_directory (const char *name)
       /* Remove any trailing '\'.  Windows32 stat fails even on valid
          directories if they end in '\'. */
       if (p[-1] == '\\')
-        p[-1] = '\0';
+        ((char *)p)[-1] = '\0';
 #endif
 
 #ifdef VMS
@@ -471,7 +471,7 @@ find_directory (const char *name)
       /* Put back the trailing '\'.  If we don't, we're permanently
          truncating the value!  */
       if (p[-1] == '\0')
-        p[-1] = '\\';
+        ((char *)p)[-1] = '\\';
 #endif
 
       if (r < 0)
Index: make.h
===================================================================
RCS file: /sources/make/make/make.h,v
retrieving revision 1.129
diff -u -p -r1.129 make.h
--- make.h	4 Jul 2007 19:35:19 -0000	1.129
+++ make.h	30 Sep 2007 03:15:35 -0000
@@ -329,7 +329,7 @@ char *strsignal (int signum);
 # define kill(_pid,_sig) w32_kill((_pid),(_sig))
 
 void sync_Path_environment (void);
-int kill (int pid, int sig);
+int w32_kill (int pid, int sig);
 char *end_of_token_w32 (const char *s, char stopchar);
 int find_and_set_default_shell (const char *token);