patch bzero/bcopy conflict out of existence. still more to fix.

This commit is contained in:
espie 2002-03-26 19:58:37 +00:00
parent 244d5d7c87
commit d23d82ea79
3 changed files with 65 additions and 0 deletions

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-lib_RK_RKintern_h,v 1.1 2002/03/26 19:58:37 espie Exp $
--- lib/RK/RKintern.h.orig Tue Mar 26 20:37:35 2002
+++ lib/RK/RKintern.h Tue Mar 26 20:38:02 2002
@@ -105,7 +105,11 @@ extern void free();
# include <memory.h>
# endif
-# ifndef __EMX__
-# define bzero(buf, size) memset((char *)(buf), 0x00, (size))
-# define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
+# ifdef __OpenBSD__
+# include <string.h>
+# else
+# ifndef __EMX__
+# define bzero(buf, size) memset((char *)(buf), 0x00, (size))
+# define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
+# endif
# endif
#endif

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-lib_canna_canna_h,v 1.1 2002/03/26 19:58:37 espie Exp $
--- lib/canna/canna.h.orig Tue Mar 26 20:32:09 2002
+++ lib/canna/canna.h Tue Mar 26 20:33:34 2002
@@ -110,7 +110,11 @@ extern CANNA_wcstombs pro((char *, wchar
# include <memory.h>
# endif
-# ifndef __EMX__
-# define bzero(buf, size) memset((char *)(buf), 0x00, (size))
-# define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
+# ifdef __OpenBSD__
+# include <string.h>
+# else
+# ifndef __EMX__
+# define bzero(buf, size) memset((char *)(buf), 0x00, (size))
+# define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
+# endif
# endif
#endif

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-server_IR_h,v 1.1 2002/03/26 19:58:37 espie Exp $
--- server/IR.h.orig Tue Mar 26 20:33:53 2002
+++ server/IR.h Tue Mar 26 20:34:33 2002
@@ -32,13 +32,17 @@
# include <memory.h>
# endif
-# ifndef __EMX__
-# ifndef bcopy
-# define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
-# endif
-# ifndef bzero
-# define bzero(buf, size) memset((char *)(buf), 0x00, (size))
-# endif
+# ifdef __OpenBSD__
+# include <string.h>
# else
-# include <sys/types.h>
+# ifndef __EMX__
+# ifndef bcopy
+# define bcopy(src, dst, size) memcpy((char *)(dst), (char *)(src), (size))
+# endif
+# ifndef bzero
+# define bzero(buf, size) memset((char *)(buf), 0x00, (size))
+# endif
+# else
+# include <sys/types.h>
+# endif
# endif
#endif