[x86-64 patch 6/11] ISDN strcpy removed

[x86-64 patch 6/11] ISDN strcpy removed

[Vojtech Pavlik]

Hi!

The ISDN code contains an extra definition of strcpy which isn't needed
and collides with the kernel library one. This patch removes it.

diff -urN linux-x86_64/drivers/isdn/sc/debug.c linux/drivers/isdn/sc/debug.c
--- linux-x86_64/drivers/isdn/sc/debug.c	Thu Apr 19 22:01:36 2001
+++ linux/drivers/isdn/sc/debug.c	Thu Sep 13 10:52:56 2001
@@ -26,8 +26,7 @@
  *     +1 (416) 297-6433 Facsimile
  */
 #include <linux/kernel.h>
-
-inline char *strcpy(char *, const char *);
+#include <linux/string.h>
 
 int dbg_level = 0;
 static char dbg_funcname[255];
@@ -45,19 +44,6 @@
 	strcpy(dbg_funcname, func);
 	if(dbg_level)
 		printk("--> Entering function %s\n", dbg_funcname);
-}
-
-inline char *strcpy(char *dest, const char *src)
-{
-	char *i = dest;
-	char *j = (char *) src;
-
-	while(*j) {
-		*i = *j;
-		i++; j++;
-	}
-	*(++i) = 0;
-	return dest;
 }
 
 inline void pullphone(char *dn, char *str)

-- 
Vojtech Pavlik
SuSE Labs