Fixed some compile warnings on Fedora (new glibc)

[dump.git] / compat / include / bsdcompat.h

diff --git a/compat/include/bsdcompat.h b/compat/include/bsdcompat.h
index 0edf00db24009f3374303f7401b1d676e78beb7f..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.20 2003/10/26 16:05:46 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)))
@@ -87,7 +93,7 @@ typedef int8_t __s8;
 typedef int16_t __s16;
 typedef int32_t __s32;
 #ifndef u_int
-#typedef unsigned int u_int;
+typedef unsigned int u_int;
 #endif
 #ifndef u_int16_t
 typedef unsigned short u_int16_t;