1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
$NetBSD: patch-af,v 1.1 2006/12/12 03:37:30 dogcow Exp $
--- ../common/mem.h.orig 2000-08-20 19:12:59.000000000 +1000
+++ ../common/mem.h 2006-12-03 15:21:22.000000000 +1000
@@ -26,8 +26,9 @@
} \
}
#define BINC_GOTOW(sp, lp, llen, nlen) { \
- CHAR_T *L__bp = lp; \
- BINC_GOTO(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T)) \
+ char *L__lp = (char *)lp; \
+ BINC_GOTO(sp, L__lp, llen, (nlen) * sizeof(CHAR_T)) \
+ lp = (CHAR_T *) L__lp; \
}
#define BINC_RET(sp, lp, llen, nlen) { \
char *L__p = lp; \
@@ -43,8 +44,9 @@
} \
}
#define BINC_RETW(sp, lp, llen, nlen) { \
- CHAR_T *L__bp = lp; \
- BINC_RET(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T)) \
+ char *L__lp = (char *)lp; \
+ BINC_RET(sp, L__lp, llen, (nlen) * sizeof(CHAR_T)) \
+ lp = (CHAR_T *) L__lp; \
}
/*
@@ -66,8 +68,9 @@
} \
}
#define GET_SPACE_GOTOW(sp, bp, blen, nlen) { \
- CHAR_T *L__bp = bp; \
- GET_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T)) \
+ char *L__bp = (char *)bp; \
+ GET_SPACE_GOTO(sp, L__bp, blen, (nlen) * sizeof(CHAR_T)) \
+ bp = (CHAR_T *) L__bp; \
}
#define GET_SPACE_RET(sp, bp, blen, nlen) { \
WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp; \
@@ -83,8 +86,9 @@
} \
}
#define GET_SPACE_RETW(sp, bp, blen, nlen) { \
- CHAR_T *L__bp = bp; \
- GET_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T)) \
+ char *L__bp = (char *)bp; \
+ GET_SPACE_RET(sp, L__bp, blen, (nlen) * sizeof(CHAR_T)) \
+ bp = (CHAR_T *) L__bp; \
}
/*
@@ -103,8 +107,9 @@
BINC_GOTO(sp, bp, blen, nlen); \
}
#define ADD_SPACE_GOTOW(sp, bp, blen, nlen) { \
- CHAR_T *L__bp = bp; \
- ADD_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T)) \
+ char *L__bp = (char *)bp; \
+ ADD_SPACE_GOTO(sp, L__bp, blen, (nlen) * sizeof(CHAR_T)) \
+ bp = (CHAR_T *) L__bp; \
}
#define ADD_SPACE_RET(sp, bp, blen, nlen) { \
WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp; \
@@ -118,8 +123,9 @@
BINC_RET(sp, bp, blen, nlen); \
}
#define ADD_SPACE_RETW(sp, bp, blen, nlen) { \
- CHAR_T *L__bp = bp; \
- ADD_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T)) \
+ char *L__bp = (char *)bp; \
+ ADD_SPACE_RET(sp, L__bp, blen, (nlen) * sizeof(CHAR_T)) \
+ bp = (CHAR_T *) L__bp; \
}
/* Free a GET_SPACE returned buffer. */
|
