default_modify.c:

  Use MY_STAT to declare argument to my_fstat()
des_key_file.cc:
  Use local seach path for "mysql_priv.h"
mysys.dsp, libmysqld.dsp, libmysql.dsp:
  New file needed, "../mysys/default_modify.c"

VC++Files/libmysql/libmysql.dsp

@@ -219,6 +219,10 @@ SOURCE=..\mysys\default.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\default_modify.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\dll.c
 # End Source File
 # Begin Source File

VC++Files/libmysqld/libmysqld.dsp

@@ -180,6 +180,10 @@ SOURCE=..\mysys\default.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\default_modify.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\derror.cpp
 # End Source File
 # Begin Source File

VC++Files/mysys/mysys.dsp

@@ -204,6 +204,10 @@ SOURCE=.\default.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\default_modify.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\errors.c
 # End Source File
 # Begin Source File

mysys/default_modify.c

@@ -42,7 +42,7 @@ int modify_defaults_file(const char *file_location, const char *option,
                          const char *section_name, int remove_option)
 {
   FILE *cnf_file;
-  struct stat file_stat;
+  MY_STAT file_stat;
   char linebuff[BUFF_SIZE], tmp[BUFF_SIZE], *tmp_ptr, *src_ptr, *dst_ptr,
        *file_buffer;
   uint optlen, optval_len, sect_len;

sql/des_key_file.cc

@@ -14,7 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <mysql_priv.h>
+#include "mysql_priv.h"
 #include <m_ctype.h>
 
 #ifdef HAVE_OPENSSL