Reverts PR 906 and 907 due to binary compatibility issues (#918)

1 files changed, 6 insertions, 6 deletions

diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index 0a2ea5d..5bcbf45 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -34,8 +34,8 @@ char *ub_file     = NULL;
  * parameters. The long-named ones can be partially spelled. When
  * adding more, make sure that they don't clash with each other.
  */
-static const char *           s_opts   = "hi:u:o:c:V"; /* add more later ? */
-static struct h5_long_options l_opts[] = {
+static const char *        s_opts   = "hi:u:o:c:V"; /* add more later ? */
+static struct long_options l_opts[] = {
     {"help", no_arg, 'h'},    {"hel", no_arg, 'h'},   {"i", require_arg, 'i'}, /* input file */
     {"u", require_arg, 'u'},                                                   /* user block file */
     {"o", require_arg, 'o'},                                                   /* output file */
@@ -113,16 +113,16 @@ parse_command_line(int argc, const char *argv[])
     int opt = FALSE;
 
     /* parse command line options */
-    while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
             case 'o':
-                output_file = HDstrdup(H5_optarg);
+                output_file = HDstrdup(opt_arg);
                 break;
             case 'i':
-                input_file = HDstrdup(H5_optarg);
+                input_file = HDstrdup(opt_arg);
                 break;
             case 'u':
-                ub_file = HDstrdup(H5_optarg);
+                ub_file = HDstrdup(opt_arg);
                 break;
             case 'c':
                 do_clobber = TRUE;