Apply varargs patch from Martin for bug 2443

diff --git a/bacula/src/lib/output.h b/bacula/src/lib/output.h
index 64a5d7c9e161436fed78a009bb18320bbbb4f9a9..97e4e3e1a628bfcd56fb871cbdaf73ff5a91d6ef 100644 (file)
--- a/bacula/src/lib/output.h
+++ b/bacula/src/lib/output.h
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2018 Kern Sibbald
+   Copyright (C) 2000-2019 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -25,7 +25,7 @@
 
 #include "bacula.h"
 
-typedef enum {
+enum _OutputType {
    OT_INT,                      /* Integer */
    OT_SIZE,                     /* int64 size */
    OT_PINT32,                   /* Uint32 */
@@ -47,7 +47,9 @@ typedef enum {
    OT_END_OBJ,                  /* Skip a line to end current object (no extra arg) */
    OT_CLEAR,                    /* truncate current buffer (no extra arg) */
    OT_DURATION                  /* time duration in second */
-} OutputType;
+};
+/* Force OutputType to int to avoid compiler default conversion warnings */
+typedef int OutputType;
 
 /* Keep the same order for get_options/parse_options */
 typedef enum {

diff --git a/bacula/src/lib/var.h b/bacula/src/lib/var.h
index df94f867f437f7ffa462661627d5f0441a224178..212e928d35ce0ae188ca7413dd31d9ddaee70ab0 100644 (file)
--- a/bacula/src/lib/var.h
+++ b/bacula/src/lib/var.h
@@ -15,7 +15,7 @@
 **  For disclaimer see below.
 */
 /*
- * Modified for use with Bacula by Kern Sibbald, June 2003
+ * Modified for use with Bacula by Kern Sibbald, June 2003, Jan 2019
  */
 
 
@@ -77,11 +77,13 @@ typedef enum {
 struct var_st;
 typedef struct var_st var_t;
 
-typedef enum {
+enum _var_config_t {
     VAR_CONFIG_SYNTAX,
     VAR_CONFIG_CB_VALUE,
     VAR_CONFIG_CB_OPERATION
-} var_config_t;
+};
+/* Force var_config_t to int to avoid compiler default conversion warnings */
+typedef int var_config_t;
 
 typedef struct {
     char  escape;       /* default: '\' */