Index: configure.in
===================================================================
--- configure.in	(revision 520779)
+++ configure.in	(working copy)
@@ -1166,6 +1166,7 @@
 else
     AC_ERROR([Cannot determine size of void*])
 fi
+ac_cv_sizeof_voidp=`echo $ac_cv_sizeof_voidp | sed -e 's/\r//'`
 
 dnl Checks for integer size
 AC_CHECK_SIZEOF(char, 1)
@@ -1174,6 +1175,13 @@
 AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(long long, 8)
 
+ac_cv_sizeof_char=`echo $ac_cv_sizeof_char | sed -e 's/\r//'`
+ac_cv_sizeof_int=`echo $ac_cv_sizeof_int | sed -e 's/\r//'`
+ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | sed -e 's/\r//'`
+ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | sed -e 's/\r//'`
+ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | sed -e 's/\r//'`
+ac_cv_sizeof_longlong=`echo $ac_cv_sizeof_longlong | sed -e 's/\r//'`
+
 if test "$ac_cv_sizeof_short" = "2"; then
     short_value=short
 fi
Index: threadproc/win32/proc.c
===================================================================
--- threadproc/win32/proc.c	(revision 520779)
+++ threadproc/win32/proc.c	(working copy)
@@ -46,6 +46,9 @@
 #define SW_HIDE 0
 #endif
 #endif
+#ifndef LOGON32_LOGON_NETWORK
+#define LOGON32_LOGON_NETWORK       3
+#endif
 /* 
  * some of the ideas expressed herein are based off of Microsoft
  * Knowledge Base article: Q190351
Index: misc/win32/start.c
===================================================================
--- misc/win32/start.c	(revision 520779)
+++ misc/win32/start.c	(working copy)
@@ -18,7 +18,7 @@
 #include "apr_general.h"
 #include "apr_pools.h"
 #include "apr_signal.h"
-#include "ShellAPI.h"
+#include "shellapi.h"
 
 #include "apr_arch_misc.h"       /* for WSAHighByte / WSALowByte */
 #include "wchar.h"
Index: build/apr_common.m4
===================================================================
--- build/apr_common.m4	(revision 520779)
+++ build/apr_common.m4	(working copy)
@@ -463,7 +463,7 @@
 $1
 main()
 {
-  FILE *f=fopen("conftestval", "w");
+  FILE *f=fopen("conftestval", "wb");
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof($2));
   exit(0);