[svn-r24803] Description:

    Rename GCC_DIAG_OFF/ON macros to H5_GCC_DIAG_OFF/ON and move from
src/H5private.h to src/H5public.h.  Wrap typedef of hsize_t and hssize_t
in DIAG_OFF(long-long) macros.

    Clean up a bunch of "macro '-' is unused" warnings.

Tested on:
    Mac OSX/64 10.9.2 (amazon) w/gcc 4.8.2, C++, FORTRAN, parallel
    (too minor to require h5committest)

3 files changed, 22 insertions, 55 deletions

diff --git a/tools/h5jam/getub.c b/tools/h5jam/getub.c
index 3aff2b4..776eaeb 100644
--- a/tools/h5jam/getub.c
+++ b/tools/h5jam/getub.c
@@ -26,9 +26,6 @@
 
 void parse_command_line (int argc, const char *argv[]);
 
-#define TRUE 1
-#define FALSE 0
-
 /* Name of tool */
 #define PROGRAMNAME "getub"
 char *nbytes = NULL;
@@ -79,21 +76,21 @@ usage (const char *prog)
 void
 parse_command_line (int argc, const char *argv[])
 {
-  int opt = FALSE;
+  int opt;
 
   /* parse command line options */
   while ((opt = get_option (argc, argv, s_opts, l_opts)) != EOF)
     {
       switch ((char) opt)
-  {
-  case 'c':
-    nbytes = HDstrdup (opt_arg);
-    break;
-  case '?':
-  default:
-    usage (h5tools_getprogname());
-    exit (EXIT_FAILURE);
-  }
+      {
+      case 'c':
+        nbytes = HDstrdup (opt_arg);
+        break;
+      case '?':
+      default:
+        usage (h5tools_getprogname());
+        exit (EXIT_FAILURE);
+      }
     }
 
   if (argc <= opt_ind)
diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c
index ca3d86c..9636597 100644
--- a/tools/h5jam/h5jamgentest.c
+++ b/tools/h5jam/h5jamgentest.c
@@ -28,7 +28,9 @@
 #include "hdf5.h"
 #include "H5private.h"
 
+/* not used yet
 #define UBTXT1 "u0.txt"
+*/
 #define UBTXT2 "u10.txt"
 #define UBTXT3 "u511.txt"
 #define UBTXT4 "u512.txt"
@@ -69,24 +71,7 @@ char pattern[11] = "abcdefghij";
 
 #define BUF_SIZE 1024
 
-#define LENSTR  50
-#define LENSTR2  11
-
-#define SPACE2_RANK 2
-#define SPACE2_DIM1 10
-#define SPACE2_DIM2 10
-
-#define SPACE1_RANK 1
-#define SPACE1_DIM1 4
-
-#define DIM1  20
-#define DIM2  10
-#define CDIM1 DIM1/2
-#define CDIM2 DIM2/2
-#define RANK  2
-
 /* Element selection information */
-#define POINT1_NPOINTS 10
 
 typedef enum{
      RED,
@@ -106,22 +91,10 @@ typedef struct s1_t {
 
 /* 1-D array datatype */
 #define ARRAY1_RANK 1
-#define ARRAY1_DIM1 4
-
-/* 3-D array datatype */
-#define ARRAY2_RANK 3
-#define ARRAY2_DIM1 3
-#define ARRAY2_DIM2 4
-#define ARRAY2_DIM3 5
 
 /* 2-D array datatype */
-#define ARRAY3_RANK 2
-#define ARRAY3_DIM1 6
 #define ARRAY3_DIM2 3
 
-/* VL string datatype name */
-#define VLSTR_TYPE      "vl_string_type"
-
 /* A UD link traversal function.  Shouldn't actually be called. */
 static hid_t UD_traverse(const char UNUSED * link_name, hid_t UNUSED cur_group,
     const void UNUSED * udata, size_t UNUSED udata_size, hid_t UNUSED lapl_id)
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index 0169d71..b4f87af 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -24,9 +24,6 @@
 #include "h5tools.h"
 #include "h5tools_utils.h"
 
-#define TRUE 1
-#define FALSE 0
-
 /* Name of tool */
 #define PROGRAMNAME "tellub"
 
@@ -85,21 +82,21 @@ usage (const char *prog)
 static void
 parse_command_line (int argc, const char *argv[])
 {
-  int opt = FALSE;
+  int opt;
 
   /* parse command line options */
   while ((opt = get_option (argc, argv, s_opts, l_opts)) != EOF)
     {
       switch ((char) opt)
-  {
-  case 'h':
-    usage (h5tools_getprogname());
-    exit (EXIT_SUCCESS);
-  case '?':
-  default:
-    usage (h5tools_getprogname());
-    exit (EXIT_FAILURE);
-  }
+      {
+      case 'h':
+        usage (h5tools_getprogname());
+        exit (EXIT_SUCCESS);
+      case '?':
+      default:
+        usage (h5tools_getprogname());
+        exit (EXIT_FAILURE);
+      }
     }
 
   /* check for file name to be processed */