From 1cd5461a5375207602f2cbdfd9a50a9b751cb7c8 Mon Sep 17 00:00:00 2001
From: Trutz Behn
Date: Wed, 3 Jun 2015 19:27:01 +0200
Subject: Use namespace-safe macro, param and variable names

---
 include/strings.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'include/strings.h')

diff --git a/include/strings.h b/include/strings.h
index ed8efdb..4eb5486 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -30,23 +30,23 @@ extern "C" {
  || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
 #undef bcopy
 #undef bzero
-fortify_fn(bcopy) void bcopy(const void *src, void *dst, size_t n)
+_FORTIFY_FN(bcopy) void bcopy(const void *__s, void *__d, size_t __n)
 {
-	size_t bos_dst = __builtin_object_size(dst, 0);
-	size_t bos_src = __builtin_object_size(src, 0);
+	size_t __bd = __builtin_object_size(__d, 0);
+	size_t __bs = __builtin_object_size(__s, 0);
 
-	if (n > bos_dst || n > bos_src)
+	if (__n > __bd || __n > __bs)
 		__builtin_trap();
-	return __orig_bcopy(src, dst, n);
+	return __orig_bcopy(__s, __d, __n);
 }
 
-fortify_fn(bzero) void bzero(void *src, size_t n)
+_FORTIFY_FN(bzero) void bzero(void *__s, size_t __n)
 {
-	size_t bos = __builtin_object_size(src, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (n > bos)
+	if (__n > __b)
 		__builtin_trap();
-	return __orig_bzero(src, n);
+	return __orig_bzero(__s, __n);
 }
 #endif
 
-- 
cgit v1.3