[svn-r19469] Bug fix for 1707 - My previous checkin wasn't complete. I left out the case when the

deprecated symbols were disabled.  I made a different definition for H5E_auto_op_t when the
deprecated symbols were disabled.

Tested on jam - a simple change.

2 files changed, 9 insertions, 2 deletions

diff --git a/src/H5E.c b/src/H5E.c
index 55137ba..704253f 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -177,7 +177,6 @@ H5E_set_default_auto(H5E_t *stk)
 #endif /* H5_USE_16_API_DEFAULT */
 #ifdef H5_NO_DEPRECATED_SYMBOLS
     stk->auto_op.vers = 2;
-    stk->auto_op.func1 = NULL;
 #else
     stk->auto_op.func1 = (H5E_auto1_t)H5Eprint1;
 #endif
diff --git a/src/H5Epkg.h b/src/H5Epkg.h
index fc82502..b9688d2 100644
--- a/src/H5Epkg.h
+++ b/src/H5Epkg.h
@@ -68,12 +68,20 @@
 /****************************/
 
 /* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 typedef struct {
     unsigned    vers;       /* Which version callback to use */
-    hbool_t     user_set;
+    hbool_t     user_set;   /* If the printing function has been set. */
     H5E_auto1_t func1;      /* Old-style callback, NO error stack param. */
     H5E_auto2_t func2;      /* New-style callback, with error stack param. */
 } H5E_auto_op_t;
+#else
+typedef struct {
+    unsigned    vers;       /* Which version callback to use */
+    hbool_t     user_set;   /* If the printing function has been set. */
+    H5E_auto_t  func2;      /* Only the new style callback function is available. */
+} H5E_auto_op_t;
+#endif
 
 /* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */
 typedef struct {