diff options
| author | Daichi GOTO <daichi@FreeBSD.org> | 2012-05-09 19:28:24 +0000 |
|---|---|---|
| committer | Daichi GOTO <daichi@FreeBSD.org> | 2012-05-09 19:28:24 +0000 |
| commit | d5110194a59360ce3b0cc2dbe57360beba1c4a19 (patch) | |
| tree | 4f92857a5f840d9d8638b6aaec61db2614e62b06 /japanese/kon2-16dot/files/patch-include_mem.h | |
| parent | Update to 2.03pre8 (diff) | |
- fixed the building on amd64
- fixed the building on 9+
- clean-up patches
PR: 167724
Submitted by: Masamichi Takatsu <taka2@doga.co.jp>
Notes
Notes:
svn path=/head/; revision=296316
Diffstat (limited to 'japanese/kon2-16dot/files/patch-include_mem.h')
| -rw-r--r-- | japanese/kon2-16dot/files/patch-include_mem.h | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/japanese/kon2-16dot/files/patch-include_mem.h b/japanese/kon2-16dot/files/patch-include_mem.h index c94dba660faa..308d713a16ad 100644 --- a/japanese/kon2-16dot/files/patch-include_mem.h +++ b/japanese/kon2-16dot/files/patch-include_mem.h @@ -1,9 +1,34 @@ - --- include/mem.h 30 Sep 2008 08:09:55 -0000 1.1.1.2 - +++ include/mem.h 23 Oct 2008 09:24:33 -0000 - @@ -111,6 +111,5 @@ - extern void wmove(void *, void *, int); - extern void lmove(void *, void *, int); - #endif - -extern void SafeFree(void **); - - #endif +--- include/mem.h.orig 1997-01-24 16:06:22.000000000 +0900 ++++ include/mem.h 2012-05-10 00:14:28.759551808 +0900 +@@ -46,6 +46,7 @@ + "d" ((u_short) port)); + } + ++#if 0 + static inline + void lzero(void *head, int n) + { +@@ -93,11 +94,22 @@ + "D" ((long)head) + :"cx","di"); + } ++#endif + + extern u_char PortInb(u_short); ++#if 1 ++#define bzero(b, len) bzero(b, len) ++#define bzero2(b, len) bzero(b, len) ++#define lzero(b, len) bzero(b, len) ++#define wzero(b, len) bzero(b, len) ++#define bmove(dst, src, len) bcopy(src, dst, len) ++#define brmove(dst, src, len) bcopy(src, dst, len) ++#define wmove(dst, src, len) bcopy(src, dst, len) ++#define lmove(dst, src, len) bcopy(src, dst, len) ++#else + extern void wzero(void *, int); + extern void wmove(void *, void *, int); + extern void lmove(void *, void *, int); +-extern void SafeFree(void **); ++#endif + + #endif |