Fix for mingw-w64 build

diff --git a/Src/PathContext.h b/Src/PathContext.h
index 3482c4f..9be348e 100644 (file)
--- a/Src/PathContext.h
+++ b/Src/PathContext.h
@@ -21,7 +21,7 @@ class PathContext;
  */
 class PathInfo
 {
-       friend PathContext;
+       friend class PathContext;
 public:
        PathInfo() {}
        PathInfo(const PathInfo &pi);

diff --git a/Src/diffutils/src/system.h b/Src/diffutils/src/system.h
index bcd9440..f60f880 100644 (file)
--- a/Src/diffutils/src/system.h
+++ b/Src/diffutils/src/system.h
@@ -212,7 +212,9 @@ int pclose(FILE *);
 #endif
 
 #ifdef __NT__
+#ifndef _PID_T_
 typedef int pid_t;
+#endif
 #define popen  _popen
 #define pclose _pclose
 #endif