about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2013-05-08 00:00:46 +0200
committerAurelien Jarno <aurelien@aurel32.net>2013-05-08 00:00:46 +0200
commitba8539473296645ef5e710e506534682f9eb5572 (patch)
tree08a5622255d6fefcc4ed6778171e71642238b3fa
parent8347c74cc5c972aa9e57747177b1f5f4b1cbcac8 (diff)
downloadglibc-ba8539473296645ef5e710e506534682f9eb5572.tar.gz
glibc-ba8539473296645ef5e710e506534682f9eb5572.tar.xz
glibc-ba8539473296645ef5e710e506534682f9eb5572.zip
Only defined DEV_BSIZE if not already defined.
-rw-r--r--ChangeLog4
-rw-r--r--misc/sys/param.h4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index de6646b3d6..fa126348c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-07  Aurelien Jarno <aurelien@aurel32.net>
+
+	* misc/sys/param.h (DEV_BSIZE): Define only if not already defined.
+
 2013-05-07  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/generic/ldsodefs.h [IS_IN_rtld]: Declare _dl_skip_args
diff --git a/misc/sys/param.h b/misc/sys/param.h
index 5e6353d1e8..d257ec7576 100644
--- a/misc/sys/param.h
+++ b/misc/sys/param.h
@@ -71,7 +71,9 @@
 
 
 /* Unit of `st_blocks'.  */
-#define DEV_BSIZE       512
+#ifndef DEV_BSIZE
+# define DEV_BSIZE	512
+#endif
 
 
 /* Bit map related macros.  */