diff options
| author | obrien <obrien@FreeBSD.org> | 2000-10-26 10:00:52 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-10-26 10:00:52 +0000 |
| commit | 82cfc38d6c3b6c3fc2f69fa905662dd200648130 (patch) | |
| tree | 29effa9d6714a6b6f94ac4eaed75086c57aa3634 /usr.bin/window/string.c | |
| parent | ec817875345826d65474ba3a3d504110e8c6fbc0 (diff) | |
| download | FreeBSD-src-82cfc38d6c3b6c3fc2f69fa905662dd200648130.zip FreeBSD-src-82cfc38d6c3b6c3fc2f69fa905662dd200648130.tar.gz | |
Having a local `string.h' is just asking for trouble. As is having a
`struct string'. Rename the struct and effectively rename the header
to `mystring.h'
Diffstat (limited to 'usr.bin/window/string.c')
| -rw-r--r-- | usr.bin/window/string.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c index 9d1c145..29e3287 100644 --- a/usr.bin/window/string.c +++ b/usr.bin/window/string.c @@ -36,10 +36,11 @@ #ifndef lint static char sccsid[] = "@(#)string.c 8.1 (Berkeley) 6/6/93"; +static char rcsid[] = "@(#)$FreeBSD$"; #endif /* not lint */ #include <string.h> /* System string definitions. */ -#include "string.h" /* Local string definitions. */ +#include "mystring.h" /* Local string definitions. */ char *malloc(); @@ -123,9 +124,9 @@ char * str_alloc(l) int l; { - register struct string *s; + register struct mystring *s; - s = (struct string *) malloc((unsigned)l + str_offset); + s = (struct mystring *) malloc((unsigned)l + str_offset); if (s == 0) return 0; if (str_head.s_forw == 0) @@ -140,7 +141,7 @@ int l; str_free(str) char *str; { - register struct string *s; + register struct mystring *s; for (s = str_head.s_forw; s != &str_head && s->s_data != str; s = s->s_forw) |
