From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Wed, 22 Aug 2018 13:43:13 +0000 (-0600)
Subject: AIX defines rsize_t in string.h, not stddef.h for use by the
X-Git-Tag: SUDO_1_8_25^2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9dec932772ffc3f8b2047af8ab86afec47adf37;p=sudo

AIX defines rsize_t in string.h, not stddef.h for use by the
memset_s() prototype.  We use our own memset_s() on AIX since it
is not available on all BOS levels which makes package building
problematic.
---

diff --git a/include/sudo_compat.h b/include/sudo_compat.h
index 62ba7c769..535b4e950 100644
--- a/include/sudo_compat.h
+++ b/include/sudo_compat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 1998-2005, 2008, 2009-2017
+ * Copyright (c) 1996, 1998-2005, 2008, 2009-2018
  *	Todd C. Miller <Todd.Miller@sudo.ws>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,7 +24,12 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <stddef.h>	/* for rsize_t */
+#ifndef HAVE_MEMSET_S
+# include <stddef.h>	/* for rsize_t */
+# ifdef HAVE_STRING_H
+#  include <string.h>	/* for rsize_t on some systems */
+# endif /* HAVE_STRING_H */
+#endif /* HAVE_MEMSET_S */
 
 /*
  * Macros and functions that may be missing on some operating systems.