3 files changed, 13 insertions, 6 deletions
diff --git a/winsup/cygwin/include/cygwin/fs.h b/winsup/cygwin/include/cygwin/fs.h
index eb8c7e3d1..509b9c555 100644
--- a/winsup/cygwin/include/cygwin/fs.h
+++ b/winsup/cygwin/include/cygwin/fs.h
@@ -1,6 +1,6 @@
 /* cygwin/fs.h
 
-   Copyright 2002, 2003 Red Hat Inc.
+   Copyright 2002, 2003, 2012 Red Hat Inc.
    Written by Chris January <chris@atomice.net>
 
 This file is part of Cygwin.
@@ -12,9 +12,13 @@ details. */
 #ifndef _CYGWIN_FS_H_
 #define _CYGWIN_FS_H_
 
-#define BLKRRPART  0x0000125f
-#define BLKGETSIZE 0x00001260
-#define BLKSSZGET  0x00001268
+#define BLKRRPART    0x0000125f
+#define BLKGETSIZE   0x00001260
+#define BLKSSZGET    0x00001268
+#define BLKIOMIN     0x00001278
+#define BLKIOOPT     0x00001279
+#define BLKALIGNOFF  0x0000127a
+#define BLKPBSZGET   0x0000127b
 #define BLKGETSIZE64 0x00041268
 
 #endif
diff --git a/winsup/cygwin/include/cygwin/in.h b/winsup/cygwin/include/cygwin/in.h
index 49957293d..a64160e8f 100644
--- a/winsup/cygwin/include/cygwin/in.h
+++ b/winsup/cygwin/include/cygwin/in.h
@@ -112,11 +112,15 @@ enum
   IPPORT_USERRESERVED = 5000
 };
 
+/* Avoid collision with Mingw64 headers. */
+#ifndef s_addr
 /* Internet address. */
 struct in_addr
 {
   in_addr_t s_addr;
 };
+#define s_addr s_addr
+#endif
 
 /* Request struct for IPv4 multicast socket ops */
 
diff --git a/winsup/cygwin/include/limits.h b/winsup/cygwin/include/limits.h
index 61d6ae542..58368ed1f 100644
--- a/winsup/cygwin/include/limits.h
+++ b/winsup/cygwin/include/limits.h
@@ -36,8 +36,7 @@ details. */
 
 /* Maximum length of a multibyte character.  */
 #ifndef MB_LEN_MAX
-/* TODO: This is newlib's max value.  We should probably rather define our
-   own _mbtowc_r and _wctomb_r functions which are only codepage dependent. */
+/* Use value from newlib. */
 #define MB_LEN_MAX 8
 #endif