[svn-r16489] Fixed bug #1459 by eliminating the macro long_long and replacing all instances with long long.

Tested:
   h5comittest
   fedora 10 x64
   Vista 32, VS2005, IVF101
   XP32, Cygwin
   

1 files changed, 17 insertions, 17 deletions

diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 6124bce..c5214d3 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -248,26 +248,26 @@ do_pio(parameters param)
     /* Validate transfer buffer size & block size*/
     if(blk_size<=0) {
     HDfprintf(stderr,
-        "Transfer block size (%Hd) must be > 0\n", (long_long)blk_size);
+        "Transfer block size (%Hd) must be > 0\n", (long long)blk_size);
     GOTOERROR(FAIL);
     }
     if(buf_size<=0) {
     HDfprintf(stderr,
-        "Transfer buffer size (%Hd) must be > 0\n", (long_long)buf_size);
+        "Transfer buffer size (%Hd) must be > 0\n", (long long)buf_size);
     GOTOERROR(FAIL);
     }
     if ((buf_size % blk_size) != 0){
     HDfprintf(stderr,
         "Transfer buffer size (%Hd) must be a multiple of the "
         "interleaved I/O block size (%Hd)\n",
-        (long_long)buf_size, (long_long)blk_size);
+        (long long)buf_size, (long long)blk_size);
     GOTOERROR(FAIL);
     }
     if((snbytes%pio_mpi_nprocs_g)!=0) {
     HDfprintf(stderr,
         "Dataset size (%Hd) must be a multiple of the "
         "number of processes (%d)\n",
-        (long_long)snbytes, pio_mpi_nprocs_g);
+        (long long)snbytes, pio_mpi_nprocs_g);
     GOTOERROR(FAIL);
     }
 
@@ -276,7 +276,7 @@ do_pio(parameters param)
         HDfprintf(stderr,
             "Dataset size/process (%Hd) must be a multiple of the "
             "trasfer buffer size (%Hd)\n",
-            (long_long)(snbytes/pio_mpi_nprocs_g), (long_long)buf_size);
+            (long long)(snbytes/pio_mpi_nprocs_g), (long long)buf_size);
         GOTOERROR(FAIL);
         }
     }
@@ -285,7 +285,7 @@ do_pio(parameters param)
         HDfprintf(stderr,
             "Dataset side size (%Hd) must be a multiple of the "
             "trasfer buffer size (%Hd)\n",
-            (long_long)snbytes, (long_long)buf_size);
+            (long long)snbytes, (long long)buf_size);
         GOTOERROR(FAIL);
         }
     }
@@ -293,7 +293,7 @@ do_pio(parameters param)
     /* Allocate transfer buffer */
     if ((buffer = malloc(bsize)) == NULL){
     HDfprintf(stderr, "malloc for transfer buffer size (%Hd) failed\n",
-        (long_long)(bsize));
+        (long long)(bsize));
     GOTOERROR(FAIL);
     }
 
@@ -651,13 +651,13 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
         if (!parms->dim2d) {
         HDfprintf(output, "Debug(do_write): "
             "buf_size=%Hd, bytes_begin=%Hd, bytes_count=%Hd\n",
-            (long_long)buf_size, (long_long)bytes_begin[0],
-            (long_long)bytes_count);
+            (long long)buf_size, (long long)bytes_begin[0],
+            (long long)bytes_count);
         } else {
         HDfprintf(output, "Debug(do_write): "
             "linear buf_size=%Hd, bytes_begin=(%Hd,%Hd), bytes_count=%Hd\n",
-            (long_long)buf_size*blk_size, (long_long)bytes_begin[0],
-            (long_long)bytes_begin[1], (long_long)bytes_count);
+            (long long)buf_size*blk_size, (long long)bytes_begin[0],
+            (long long)bytes_begin[1], (long long)bytes_count);
         }
     }
 
@@ -1625,13 +1625,13 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
         if (!parms->dim2d) {
         HDfprintf(output, "Debug(do_write): "
             "buf_size=%Hd, bytes_begin=%Hd, bytes_count=%Hd\n",
-            (long_long)buf_size, (long_long)bytes_begin[0],
-            (long_long)bytes_count);
+            (long long)buf_size, (long long)bytes_begin[0],
+            (long long)bytes_count);
         } else {
         HDfprintf(output, "Debug(do_write): "
             "linear buf_size=%Hd, bytes_begin=(%Hd,%Hd), bytes_count=%Hd\n",
-            (long_long)buf_size*blk_size, (long_long)bytes_begin[0],
-            (long_long)bytes_begin[1], (long_long)bytes_count);
+            (long long)buf_size*blk_size, (long long)bytes_begin[0],
+            (long long)bytes_begin[1], (long long)bytes_count);
         }
     }
 
@@ -2337,8 +2337,8 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                 HDprint_rank(output);
                 HDfprintf(output, "read data error, expected (%Hd), "
                     "got (%Hd)\n",
-                    (long_long)pio_mpi_rank_g+1,
-                    (long_long)*(ucharptr-1));
+                    (long long)pio_mpi_rank_g+1,
+                    (long long)*(ucharptr-1));
             } /* end if */
             } /* end if */
         } /* end for */