diff --git a/vendor/safestringlib/include/safe_mem_lib.h b/vendor/safestringlib/include/safe_mem_lib.h
index 162efd2eb..da4dc2a5e 100644
--- a/vendor/safestringlib/include/safe_mem_lib.h
+++ b/vendor/safestringlib/include/safe_mem_lib.h
@@ -97,7 +97,12 @@ extern errno_t wmemmove_s(wchar_t *dest, rsize_t dmax,
 
 
 /* set bytes */
-extern errno_t memset_s(void *dest, rsize_t dmax, uint8_t value);
+/* NOTE: This name is changed from memset_s to memset8_s out because it does
+ * not match with the C11 declaration of memset_s on OSX. The upstream issue
+ * can be found here:
+ * https://github.com/intel/safestringlib/issues/14
+ */
+extern errno_t memset8_s(void *dest, rsize_t dmax, uint8_t value);
 
 /* set uint16_t */
 extern errno_t memset16_s(uint16_t *dest, rsize_t dmax, uint16_t value);
diff --git a/vendor/safestringlib/safeclib/mem_primitives_lib.c b/vendor/safestringlib/safeclib/mem_primitives_lib.c
index cc189e5ea..54b596d02 100644
--- a/vendor/safestringlib/safeclib/mem_primitives_lib.c
+++ b/vendor/safestringlib/safeclib/mem_primitives_lib.c
@@ -31,6 +31,8 @@
 
 #include "mem_primitives_lib.h"
 
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 /*
  * mem_primitives_lib.c  provides unguarded memory routines
  * that are used by the safe_mem_library.   These routines
diff --git a/vendor/safestringlib/safeclib/memset_s.c b/vendor/safestringlib/safeclib/memset_s.c
index f19717d03..a1ca0ac4e 100644
--- a/vendor/safestringlib/safeclib/memset_s.c
+++ b/vendor/safestringlib/safeclib/memset_s.c
@@ -1,5 +1,5 @@
 /*------------------------------------------------------------------
- * memset_s
+ * memset8_s
  *
  * October 2008, Bo Berry
  *
@@ -37,12 +37,12 @@
 
 /**
  * NAME
- *    memset_s
+ *    memset8_s
  *
  * SYNOPSIS
  *    #include "safe_mem_lib.h"
  *    errno_t
- *    memset_s(void *dest, rsize_t len, uint8_t value)
+ *    memset8_s(void *dest, rsize_t len, uint8_t value)
  *
  * DESCRIPTION
  *    Sets len bytes starting at dest to the specified value.
@@ -78,22 +78,22 @@
  *
  */
 errno_t
-memset_s (void *dest, rsize_t len, uint8_t value)
+memset8_s (void *dest, rsize_t len, uint8_t value)
 {
     if (dest == NULL) {
-        invoke_safe_mem_constraint_handler("memset_s: dest is null",
+        invoke_safe_mem_constraint_handler("memset8_s: dest is null",
                    NULL, ESNULLP);
         return (RCNEGATE(ESNULLP));
     }
 
     if (len == 0) {
-        invoke_safe_mem_constraint_handler("memset_s: len is 0",
+        invoke_safe_mem_constraint_handler("memset8_s: len is 0",
                    NULL, ESZEROL);
         return (RCNEGATE(ESZEROL));
     }
 
     if (len > RSIZE_MAX_MEM) {
-        invoke_safe_mem_constraint_handler("memset_s: len exceeds max",
+        invoke_safe_mem_constraint_handler("memset8_s: len exceeds max",
                    NULL, ESLEMAX);
         return (RCNEGATE(ESLEMAX));
     }
@@ -102,4 +102,4 @@ memset_s (void *dest, rsize_t len, uint8_t value)
 
     return (RCNEGATE(EOK));
 }
-EXPORT_SYMBOL(memset_s)
+EXPORT_SYMBOL(memset8_s)
diff --git a/vendor/safestringlib/safeclib/safeclib_private.h b/vendor/safestringlib/safeclib/safeclib_private.h
index 7280e879a..89ee97727 100644
--- a/vendor/safestringlib/safeclib/safeclib_private.h
+++ b/vendor/safestringlib/safeclib/safeclib_private.h
@@ -32,6 +32,7 @@
 #ifndef __SAFECLIB_PRIVATE_H__
 #define __SAFECLIB_PRIVATE_H__
 
+#include "citus_config.h"
 #ifdef __KERNEL__
 /* linux kernel environment */
 
diff --git a/vendor/safestringlib/safeclib/snprintf_support.c b/vendor/safestringlib/safeclib/snprintf_support.c
index 52a0739f8..8b482c1a4 100644
--- a/vendor/safestringlib/safeclib/snprintf_support.c
+++ b/vendor/safestringlib/safeclib/snprintf_support.c
@@ -54,6 +54,7 @@
 
 #define CHK_FORMAT(X,Y)   (((X)==(Y))?1:0)
 
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
 
 unsigned int
 parse_format(const char *format, char pformatList[], unsigned int maxFormats)