Back out patches integrated upstream before import

diff --git a/src/afs/afs_callback.c b/src/afs/afs_callback.c
index 837e121d14fa2a3ad56e52da796abc536801b76a..a447223d72754f1dd89d22f0737c7b0c532708c1 100644 (file)
--- a/src/afs/afs_callback.c
+++ b/src/afs/afs_callback.c
@@ -16,7 +16,7 @@
 #include <afsconfig.h>
 #include "../afs/param.h"
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_callback.c,v 1.2 2001/09/11 20:17:54 hartmans Exp $");
+RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_callback.c,v 1.3 2001/09/20 06:04:37 hartmans Exp $");
 
 #include "../afs/sysincludes.h" /*Standard vendor system headers*/
 #include "../afs/afsincludes.h" /*AFS-based standard headers*/
@@ -1160,7 +1160,7 @@ int SRXAFSCB_GetCellServDB(
 
     t_name[i] = '\0';
     if (p_name)
-       memcpy(p_name, t_name, i);
+       bcopy(p_name, t_name, i);
 
     ReleaseReadLock(&afs_xcell);
 
@@ -1237,7 +1237,7 @@ int SRXAFSCB_GetLocalCell(
 
     t_name[plen] = '\0';
     if (p_name)
-       memcpy(p_name, t_name, plen);
+       bcopy(p_name, t_name, plen);
 
     ReleaseReadLock(&afs_xcell);
 

diff --git a/src/config/Makefile.ppc_linux22.in b/src/config/Makefile.ppc_linux22.in
index 7b68a643e2e836716f072a5fb1451a2cfa1a8462..5b1d87b8abf059da2801ff035e22aa35a1aac8c0 100644 (file)
--- a/src/config/Makefile.ppc_linux22.in
+++ b/src/config/Makefile.ppc_linux22.in
@@ -35,7 +35,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
-INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+
 # Other OS specific requirements
 #
 YACC = bison -y

diff --git a/src/config/Makefile.ppc_linux24.in b/src/config/Makefile.ppc_linux24.in
index 7fbfa919a4b5649542479c9a0670925382095ec6..00762dd0e5baffd03e24dec3c66213bf20efefdc 100644 (file)
--- a/src/config/Makefile.ppc_linux24.in
+++ b/src/config/Makefile.ppc_linux24.in
@@ -35,6 +35,7 @@ MT_CC=cc
 MV=mv
 RANLIB=ranlib
 RM=rm
+
 INSTALL=${TOP_SRCDIR}/pinstall/pinstall
 #
 # Other OS specific requirements