Fixed some compile warnings on Fedora (new glibc)

diff --git a/CHANGES b/CHANGES
index bf54202ff78d90987231f85cdd151f5731b1be8d..d75a06574d4301cbdfce66adfbd7b81eddfd26b9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.236 2004/01/04 10:48:34 stelian Exp $
+$Id: CHANGES,v 1.237 2004/01/27 10:15:36 stelian Exp $
 
 Changes between versions 0.4b35 and 0.4b36 (released ?????????????????)
 =======================================================================
@@ -6,6 +6,9 @@ Changes between versions 0.4b35 and 0.4b36 (released ?????????????????)
 1.     Fixed dump compilation with old gcc versions. Thanks to
        Mike Castle <dalgoda@users.sourceforge.net> for the patch.
 
+2.     Fixed some warnings (howmany, roundup, powerof2 redefined)
+       when compiling against a recent glibc version.
+
 Changes between versions 0.4b34 and 0.4b35 (released December 21, 2003)
 =======================================================================
 

diff --git a/compat/include/bsdcompat.h b/compat/include/bsdcompat.h
index ce7d6538544999f99e5b8a8285908f107adc3851..3e9895b57c65a15eb44e818e7b21f83bf687fc88 100644 (file)
--- a/compat/include/bsdcompat.h
+++ b/compat/include/bsdcompat.h
@@ -5,7 +5,7 @@
  *     Stelian Pop <stelian@popies.net>, 1999-2000
  *     Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
- *     $Id: bsdcompat.h,v 1.21 2003/11/22 16:52:16 stelian Exp $
+ *     $Id: bsdcompat.h,v 1.22 2004/01/27 10:15:37 stelian Exp $
  */
 
 #include <config.h>
@@ -37,9 +37,15 @@
 #define UF_NODUMP      EXT2_NODUMP_FL
 #endif
 
+#ifndef howmany
 #define howmany(x,y)   (((x)+((y)-1))/(y))
+#endif
+#ifndef roundup
 #define roundup(x, y)  ((((x)+((y)-1))/(y))*(y))
+#endif
+#ifndef powerof2
 #define powerof2(x)    ((((x)-1)&(x))==0)
+#endif
 
 #define fsbtodb(sb,b)  ((int)(((long long)(b) * EXT2_BLOCK_SIZE((sb)->super)) / DEV_BSIZE))
 #define dbtofsb(sb,b)  ((int)(((long long)(b) * DEV_BSIZE) / EXT2_BLOCK_SIZE((sb)->super)))