diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in
index 0f44b3335..13a4d114f 100644
--- a/Examples/test-suite/csharp/Makefile.in
+++ b/Examples/test-suite/csharp/Makefile.in
@@ -69,14 +69,12 @@ run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
 	  $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
 	  CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \
-	  CSHARPSRCS='`$(CSHARPCYGPATH_W) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` \
-	  `find $* -name "*.cs"`' csharp_compile && \
+	  CSHARPSRCS='`$(CSHARPCYGPATH_W) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` `find $* -name "*.cs" -exec $(CSHARPCYGPATH_W) "{}" \+`' csharp_compile && \
 	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" $(RUNTOOL) $(INTERPRETER) $*_runme.exe; \
 	else \
-	  cd $* && \
-	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
+	  $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
 	  CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -t:module -out:$*.netmodule' \
-	  CSHARPSRCS='`find . -name "*.cs"`' csharp_compile && cd .. ; \
+	  CSHARPSRCS='`find $* -name "*.cs" -exec $(CSHARPCYGPATH_W) "{}" \+`' csharp_compile; \
 	fi
 
 # Clean: remove testcase directories
diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c
index 7085f3b4a..9a2a33278 100644
--- a/Source/Swig/misc.c
+++ b/Source/Swig/misc.c
@@ -20,6 +20,10 @@ char cvsroot_misc_c[] = "$Id$";
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#ifdef _WIN32
+#include <direct.h>
+#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#endif
 
 static char *fake_version = 0;
 
@@ -170,7 +174,7 @@ String *Swig_new_subdirectory(String *basedirectory, String *subdirectory) {
 	}
       } else {
 #ifdef _WIN32
-	int result = mkdir(Char(dir));
+	int result = _mkdir(Char(dir));
 #else
 	int result = mkdir(Char(dir), 0777);
 #endif