[Pvfs2-cvs] commit by slang in pvfs2/src/common/misc: pvfs2-util.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/common/misc
In directory parlweb1:/tmp/cvs-serv20753/src/common/misc

Modified Files:
      Tag: pvfs-2-7-branch
	pvfs2-util.c 
Log Message:
fix warnings on 32bit platforms.


Index: pvfs2-util.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/pvfs2-util.c,v
diff -p -u -r1.98.2.2 -r1.98.2.3
--- pvfs2-util.c	17 Mar 2008 16:18:50 -0000	1.98.2.2
+++ pvfs2-util.c	1 Apr 2008 20:10:49 -0000	1.98.2.3
@@ -1192,24 +1192,41 @@ int PVFS_util_init_defaults(void)
 #define SI_ZETTABYTE (1000 * SI_EXABYTE)
 #define SI_YOTTABYTE (1000 * SI_ZETTABYTE)
 */
-#define NUM_SIZES                  5
+
+#if SIZEOF_LONG_INT == 8
+#define NUM_SIZES                      5
+#else
+#define NUM_SIZES                 4 
+#endif
 
 static PVFS_size PINT_s_size_table[NUM_SIZES] =
 {
     /*YOTTABYTE, ZETTABYTE, EXABYTE, */
-    PETABYTE, TERABYTE, GIGABYTE, MEGABYTE, KILOBYTE
+#if SIZEOF_LONG_INT == 8
+    PETABYTE,
+    TERABYTE, 
+#endif
+    GIGABYTE, MEGABYTE, KILOBYTE
 };
 
 static PVFS_size PINT_s_si_size_table[NUM_SIZES] =
 {
     /*SI_YOTTABYTE, SI_ZETTABYTE, SI_EXABYTE, */
-    SI_PETABYTE, SI_TERABYTE, SI_GIGABYTE, SI_MEGABYTE, SI_KILOBYTE
+#if SIZEOF_LONG_INT == 8
+    SI_PETABYTE,
+    SI_TERABYTE,
+#endif
+    SI_GIGABYTE, SI_MEGABYTE, SI_KILOBYTE
 };
 
 static const char *PINT_s_str_size_table[NUM_SIZES] =
 {
     /*"Y", "Z", "E", */
-    "P","T", "G", "M", "K"
+#if SIZEOF_LONG_INT == 8
+    "P",
+    "T", 
+#endif
+    "G", "M", "K"
 };
 
 /*