From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 7 May 2013 22:00:46 +0000 (+0200)
Subject: Only defined DEV_BSIZE if not already defined.
X-Git-Tag: glibc-2.18~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba8539473296645ef5e710e506534682f9eb5572;p=thirdparty%2Fglibc.git

Only defined DEV_BSIZE if not already defined.
---

diff --git a/ChangeLog b/ChangeLog
index de6646b3d66..fa126348c2c 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 5e6353d1e87..d257ec75769 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.  */