From 8b384a7013a6755c5a83ab71ee9065e3e48f8783 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 29 Oct 2005 16:29:22 +1000
Subject: Added missing system.h inclusion for mempcpy

All users of mempcpy must include system.h.
---
 ChangeLog      | 1 +
 src/expand.c   | 6 +-----
 src/memalloc.c | 1 +
 src/output.c   | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d2c17e..1f90a2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
 	* Added default implementation of bsearch.
 	* Added getpwhome as a wrapper for getpwnam.
 	* Fixed gcc 4.0 compilation problems.
+	* Added missing system.h inclusion for mempcpy.
 
 2005-10-26  Herbert Xu <herbert@gondor.apana.org.au>
 
diff --git a/src/expand.c b/src/expand.c
index c3f1eef..dafb51f 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -75,6 +75,7 @@
 #include "error.h"
 #include "mystring.h"
 #include "show.h"
+#include "system.h"
 
 /*
  * _rmescape() flags
@@ -1650,12 +1651,7 @@ _rmescapes(char *str, int flag)
 		}
 		q = r;
 		if (len > 0) {
-#ifdef _GNU_SOURCE
 			q = mempcpy(q, str, len);
-#else
-			memcpy(q, str, len);
-			q += len;
-#endif
 		}
 	}
 	inquotes = (flag & RMESCAPE_QUOTED) ^ RMESCAPE_QUOTED;
diff --git a/src/memalloc.c b/src/memalloc.c
index e53da2f..358e6ec 100644
--- a/src/memalloc.c
+++ b/src/memalloc.c
@@ -41,6 +41,7 @@
 #include "error.h"
 #include "machdep.h"
 #include "mystring.h"
+#include "system.h"
 
 /*
  * Like malloc, but returns an error when out of space.
diff --git a/src/output.c b/src/output.c
index 6ba3acd..2f9b5c4 100644
--- a/src/output.c
+++ b/src/output.c
@@ -62,6 +62,7 @@
 #include "memalloc.h"
 #include "error.h"
 #include "main.h"
+#include "system.h"
 
 
 #define OUTBUFSIZ BUFSIZ
-- 
cgit 1.4.1