Changeset 706

Timestamp:

10/30/09 12:55:40 (3 weeks ago)

Author:

robl

Message:

make printf happy on both 32 and 64 bit platforms

Files:

• trunk/src/lib/header.c (modified) (3 diffs)

trunk/src/lib/header.c

@@ -26 +26 @@
 #ifndef MIN
 #define MIN(mm,nn) (((mm) < (nn)) ? (mm) : (nn))
+#endif
+
+#ifdef SIZEOF_INT
+# if SIZEOF_INT == 4
+#  define lld(x) (x)
+# elif  SIZEOF_INT == 8
+#  define lld(x) (long long)(x)
+# endif
 #endif
 
@@ -1298 +1306 @@
 #ifdef METADATA_CONSISTENCY_CHECK
         if (nc_attr1->nelems != nc_attr2->nelems){
-           printf("Warning: The number of attributes (root=%d != %d) of NC definations on multiprocesses inconsistent.\n",nc_attr1->nelems,nc_attr2->nelems);
+           printf("Warning: The number of attributes (root=%lld != %lld) of NC definations on multiprocesses inconsistent.\n",lld(nc_attr1->nelems),lld(nc_attr2->nelems));
         } else {
                 for (i=0; i<nc_attr1->nelems; i++){
                    if (nc_attr1->value[i]->xsz != nc_attr2->value[i]->xsz){
-                       printf("Warning: The size of attribute (root=%d != %d) of NC definations on multiprocesses inconsistent.\n",nc_attr1->value[i]->xsz,nc_attr2->value[i]->xsz);
+                       printf("Warning: The size of attribute (root=%lld != %lld) of NC definations on multiprocesses inconsistent.\n",lld(nc_attr1->value[i]->xsz),lld(nc_attr2->value[i]->xsz));
                    }
                    if ((nc_attr1->value[i]->name->nchars != nc_attr2->value[i]->name->nchars)||(strcmp(nc_attr1->value[i]->name->cp, nc_attr2->value[i]->name->cp))){
@@ -1314 +1322 @@
                    }
                    if (nc_attr1->value[i]->nelems != nc_attr2->value[i]->nelems){
-                    printf("Warning: The length of attribute (root=%d != %d) of NC definations on multiprocesses inconsistent.\n",nc_attr1->value[i]->nelems,nc_attr2->value[i]->nelems);
+                    printf("Warning: The length of attribute (root=%lld != %lld) of NC definations on multiprocesses inconsistent.\n",lld(nc_attr1->value[i]->nelems),lld(nc_attr2->value[i]->nelems));
                    }
                 }