From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Wed, 22 Aug 2018 14:22:56 +0000 (-0600)
Subject: We still need to include string.h for AIX (and possibly others)
X-Git-Tag: SUDO_1_8_25^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a0c86bb630b521d10bbbee3102d3e00c7c3d49f;p=sudo

We still need to include string.h for AIX (and possibly others)
when we are not using the system memset_r() function and rsize_t
is defined by the system headers.
---

diff --git a/include/sudo_compat.h b/include/sudo_compat.h
index 1355f950a..b5fb9bfb4 100644
--- a/include/sudo_compat.h
+++ b/include/sudo_compat.h
@@ -24,9 +24,12 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#ifndef HAVE_MEMSET_S
+#if !defined(HAVE_MEMSET_S) && !defined(rsize_t)
 # include <stddef.h>	/* for rsize_t */
-#endif /* HAVE_MEMSET_S */
+# ifdef HAVE_STRING_H
+#  include <string.h>	/* for rsize_t on AIX */
+# endif /* HAVE_STRING_H */
+#endif /* HAVE_MEMSET_S && rsize_t */
 
 /*
  * Macros and functions that may be missing on some operating systems.