diff options
| author | Jon Loeliger <[email protected]> | 2008-06-06 10:48:31 -0500 |
|---|---|---|
| committer | Jon Loeliger <[email protected]> | 2008-06-06 10:48:31 -0500 |
| commit | 1a247ba7fa5fb09f56892a09a990f03ce564b3e2 (patch) | |
| tree | 9dab0ef013cc6dc7883454808ecf6ba4d7a7a94e /lib_generic | |
| parent | 2c289e320dcfb3760e99cf1d765cb067194a1202 (diff) | |
| parent | 8155efbd7ae9c65564ca98affe94631d612ae088 (diff) | |
Merge commit 'wd/master'
Diffstat (limited to 'lib_generic')
| -rw-r--r-- | lib_generic/Makefile | 2 | ||||
| -rw-r--r-- | lib_generic/string.c | 2 | ||||
| -rw-r--r-- | lib_generic/zlib.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib_generic/Makefile b/lib_generic/Makefile index abee19a2bb2..dca3a6cbdc6 100644 --- a/lib_generic/Makefile +++ b/lib_generic/Makefile @@ -43,7 +43,7 @@ COBJS-y += vsprintf.o COBJS-y += zlib.o COBJS := $(COBJS-y) -SRCS := $(COBJS:.o=.c) +SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) $(LIB): $(obj).depend $(OBJS) diff --git a/lib_generic/string.c b/lib_generic/string.c index e0b793abbee..181eda61499 100644 --- a/lib_generic/string.c +++ b/lib_generic/string.c @@ -263,7 +263,7 @@ char * strdup(const char *s) #ifndef __HAVE_ARCH_STRSPN /** * strspn - Calculate the length of the initial substring of @s which only - * contain letters in @accept + * contain letters in @accept * @s: The string to be searched * @accept: The string to search for */ diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c index 668ac8f8088..2b01c8f87d7 100644 --- a/lib_generic/zlib.c +++ b/lib_generic/zlib.c @@ -1115,7 +1115,7 @@ z_stream *z; n -= t; z->total_out += t; s->read = q; /* drag read pointer forward */ -/* WRAP */ /* expand WRAP macro by hand to handle s->read */ +/* WRAP */ /* expand WRAP macro by hand to handle s->read */ if (q == s->end) { s->read = q = s->window; m = WAVAIL; |