diff --git a/modules/libcom/src/yajl/yajl.c b/modules/libcom/src/yajl/yajl.c
index 3fbb87aea..fcaf8accd 100644
--- a/modules/libcom/src/yajl/yajl.c
+++ b/modules/libcom/src/yajl/yajl.c
@@ -82,11 +82,12 @@ yajl_alloc(const yajl_callbacks * callbacks,
 }
 
 int
-yajl_config(yajl_handle h, yajl_option opt, ...)
+yajl_config(yajl_handle h, int option, ...)
 {
+    yajl_option opt = option;   /* UB to use an enum in va_start */
     int rv = 1;
     va_list ap;
-    va_start(ap, opt);
+    va_start(ap, option);
 
     switch(opt) {
         case yajl_allow_comments:
diff --git a/modules/libcom/src/yajl/yajl_gen.c b/modules/libcom/src/yajl/yajl_gen.c
index a40b9760a..80b32b3a6 100644
--- a/modules/libcom/src/yajl/yajl_gen.c
+++ b/modules/libcom/src/yajl/yajl_gen.c
@@ -48,11 +48,12 @@ struct yajl_gen_t
 };
 
 int
-yajl_gen_config(yajl_gen g, yajl_gen_option opt, ...)
+yajl_gen_config(yajl_gen g, int option, ...)
 {
+    yajl_gen_option opt = option;   /* UB to use an enum in va_start */
     int rv = 1;
     va_list ap;
-    va_start(ap, opt);
+    va_start(ap, option);
 
     switch(opt) {
         case yajl_gen_beautify:
diff --git a/modules/libcom/src/yajl/yajl_gen.h b/modules/libcom/src/yajl/yajl_gen.h
index e4a2c87a3..9afa46267 100644
--- a/modules/libcom/src/yajl/yajl_gen.h
+++ b/modules/libcom/src/yajl/yajl_gen.h
@@ -105,7 +105,7 @@ extern "C" {
      *  allocation (via yajl_alloc())
      *  \returns zero in case of errors, non-zero otherwise
      */
-    YAJL_API int yajl_gen_config(yajl_gen g, yajl_gen_option opt, ...);
+    YAJL_API int yajl_gen_config(yajl_gen hand, int option, ...);
 
     /** Allocate a generator handle
      *  \param allocFuncs An optional pointer to a structure which allows
diff --git a/modules/libcom/src/yajl/yajl_parse.h b/modules/libcom/src/yajl/yajl_parse.h
index e5b565c80..f7cbbe5a5 100644
--- a/modules/libcom/src/yajl/yajl_parse.h
+++ b/modules/libcom/src/yajl/yajl_parse.h
@@ -162,7 +162,7 @@ extern "C" {
      *  allocation (via yajl_alloc())
      *  \returns zero in case of errors, non-zero otherwise
      */
-    YAJL_API int yajl_config(yajl_handle h, yajl_option opt, ...);
+    YAJL_API int yajl_config(yajl_handle h, int option, ...);
 
     /** Free a parser handle */
     YAJL_API void yajl_free(yajl_handle handle);