Make it consistently "DIAG_OFF_, then DIAG_ON_" in all cases, as that's
the order in which the macros are defined and used.
#ifndef DIAG_OFF_BISON_BYACC
#define DIAG_OFF_BISON_BYACC
#endif
-#ifndef DIAG_ON_WARN_UNUSED_RESULT
-#define DIAG_ON_WARN_UNUSED_RESULT
-#endif
+//
+// DIAG_ON_BISON_BYACC does not need to be defined.
+//
#ifndef DIAG_OFF_WARN_UNUSED_RESULT
#define DIAG_OFF_WARN_UNUSED_RESULT
#endif
+#ifndef DIAG_ON_WARN_UNUSED_RESULT
+#define DIAG_ON_WARN_UNUSED_RESULT
+#endif
#ifndef DIAG_OFF_STRICT_PROTOTYPES
#define DIAG_OFF_STRICT_PROTOTYPES
#endif