w32 build fails with mingw runtime 3.6

[Alejandro López-Valencia]

Mingw Runtime 3.6 provides definitions for S_ISLNK, _S_ISLNK, S_IFLNK,
_S_IFLNK and _lstat. Most of these definitions are non-functional, and
break fileio.c.

I am attaching a diff with the modifications I used to build CVS HEAD as
of January 12. I'm not sure it is the proper solution to the problem, 
though.

In GNU Emacs 21.3.50.1 (i386-mingw-nt5.0.2195)
 of 2005-01-12 on SHANGRI-LA
Distributor `Microsoft Corp.', version 5.0.2195
configured using `configure --with-gcc (3.3)'

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: ES
  locale-coding-system: cp1252
  default-enable-multibyte-characters: t

Major mode: Outline

Minor modes in effect:
  auto-image-file-mode: t
  display-time-mode: t
  tool-bar-mode: t
  encoded-kbd-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  unify-8859-on-encoding-mode: t
  utf-translate-cjk-mode: t
  line-number-mode: t
  transient-mark-mode: t
  view-mode: t

Recent input:
<help-echo> <help-echo> <help-echo> <help-echo> <menu-bar>
<help-menu> <emacs-problems> <help-echo> <wheel-down>
<double-wheel-down> <triple-wheel-down> <triple-wheel-down>
<triple-wheel-down> <triple-wheel-down> <triple-wheel-down>
<triple-wheel-down> <triple-wheel-down> <wheel-down>
<double-wheel-down> <triple-wheel-down> <help-echo>
<help-echo> <help-echo> <help-echo> <help-echo> <help-echo>
<help-echo> <help-echo> <help-echo> <menu-bar> <help-menu>
<report-emacs-bug>

Recent messages:
Loading regexp-opt...done
Loading font-lock...done
Loading jit-lock...done
Loading view...done
Loading outline...
Loading easy-mmode...done
Loading outline...done
Loading vc-cvs...done
View mode: type C-h for help, h for commands, q to quit.
Loading emacsbug...done

Index: fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.524
diff -u -r1.524 fileio.c
--- fileio.c    30 Dec 2004 12:28:41 -0000      1.524
+++ fileio.c    13 Jan 2005 12:15:33 -0000
@@ -144,7 +144,7 @@
 #define O_RDONLY 0
 #endif
 
-#ifndef S_ISLNK
+#if !defined(S_ISLNK) && !defined(__MINGW32__)
 #  define lstat stat
 #endif
 
@@ -2491,7 +2491,7 @@
     }
 #endif
 
-#if defined (S_ISREG) && defined (S_ISLNK)
+#if defined (S_ISREG) && defined (S_ISLNK) && !defined(__MINGW32__)
   if (input_file_statable_p)
     {
       if (!(S_ISREG (st.st_mode)) && !(S_ISLNK (st.st_mode)))
@@ -2729,7 +2729,7 @@
     {
       if (errno == EXDEV)
        {
-#ifdef S_IFLNK
+#if defined(S_IFLNK) && !defined(__MINGW32__)
           symlink_target = Ffile_symlink_p (file);
           if (! NILP (symlink_target))
             Fmake_symbolic_link (symlink_target, newname,
@@ -2819,7 +2819,7 @@
   return Qnil;
 }
 
-#ifdef S_IFLNK
+#if defined(S_IFLNK) && !defined(__MINGW32__)
 DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3,
        "FMake symbolic link to file: \nFMake symbolic link to file %s: \np",
        doc: /* Make a symbolic link to FILENAME, named LINKNAME.  Both args 
strings.
@@ -3225,7 +3225,7 @@
   if (!NILP (handler))
     return call2 (handler, Qfile_symlink_p, filename);
 
-#ifdef S_IFLNK
+#if defined(S_IFLNK) && !defined(__MINGW32__)
   {
   char *buf;
   int bufsize;
@@ -6681,7 +6681,7 @@
   defsubr (&Sdelete_file);
   defsubr (&Srename_file);
   defsubr (&Sadd_name_to_file);
-#ifdef S_IFLNK
+#if defined(S_IFLNK) && !defined(__MINGW32__)
   defsubr (&Smake_symbolic_link);
 #endif /* S_IFLNK */
 #ifdef VMS