summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/cvs/lib/stripslash.c
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/cvs/lib/stripslash.c')
-rw-r--r--gnu/usr.bin/cvs/lib/stripslash.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/usr.bin/cvs/lib/stripslash.c b/gnu/usr.bin/cvs/lib/stripslash.c
index 0c26ac6..265950e 100644
--- a/gnu/usr.bin/cvs/lib/stripslash.c
+++ b/gnu/usr.bin/cvs/lib/stripslash.c
@@ -15,11 +15,20 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#if defined(STDC_HEADERS) || defined(USG)
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if STDC_HEADERS || HAVE_STRING_H
#include <string.h>
-#else
+/* An ANSI string.h and pre-ANSI memory.h might conflict. */
+#if !STDC_HEADERS && HAVE_MEMORY_H
+#include <memory.h>
+#endif /* not STDC_HEADERS and HAVE_MEMORY_H */
+#else /* not STDC_HJEADERS and not HAVE_STRING_H */
#include <strings.h>
-#endif
+/* memory.h and strings.h conflict on some systems. */
+#endif /* not STDC_HEADERS and not HAVE_STRING_H */
/* Remove trailing slashes from PATH. */
OpenPOWER on IntegriCloud