diff options
| author | Robert de Bath <rdebath@poboxes.com> | 2003-09-20 19:44:36 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2013-10-23 23:48:49 +0200 |
| commit | 22950ba3df3a0b739786243679d69cd4094e8b20 (patch) | |
| tree | 942907e918e556d340dcbcb8ffdc0f7d020a275e /libc | |
| parent | 5613ba3c0749fa494d35c4dc36b57c5b4e6edb55 (diff) | |
| download | dev86-22950ba3df3a0b739786243679d69cd4094e8b20.tar.gz | |
Import Dev86src-0.16.13.tar.gzv0.16.13
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Makefile | 4 | ||||
| -rw-r--r-- | libc/misc/strtol.c | 6 | ||||
| -rw-r--r-- | libc/string/string.c | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/libc/Makefile b/libc/Makefile index 7d1ceb9..a9a5460 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -15,6 +15,10 @@ DEFS=-D__LIBC__ include Make.defs +ifeq ($(VERSION),) +include VERSION +endif + CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS) ############################################################################ diff --git a/libc/misc/strtol.c b/libc/misc/strtol.c index d8d62ea..25ea0ea 100644 --- a/libc/misc/strtol.c +++ b/libc/misc/strtol.c @@ -66,8 +66,8 @@ strtoul(const char *nptr, char **endptr, int base) /* If base==0 and the string begins with "0x" then we're supposed to assume that it's hexadecimal (base 16). */ - else - if (base==0 && *nptr=='0') + if (base==0 && *nptr=='0') + { if (toupper(*(nptr+1))=='X') { base=16; @@ -80,7 +80,7 @@ strtoul(const char *nptr, char **endptr, int base) base=8; nptr++; } - + } /* If base is still 0 (it was 0 to begin with and the string didn't begin with "0"), then we are supposed to assume that it's base 10 */ diff --git a/libc/string/string.c b/libc/string/string.c index d672e77..3c14e56 100644 --- a/libc/string/string.c +++ b/libc/string/string.c @@ -42,10 +42,11 @@ const char * str; #ifdef PARANOID push es - push ds ; Im not sure if this is needed, so just in case. + push ds ! Im not sure if this is needed, so just in case. pop es cld -#endif ! This is almost the same as memchr, but it can +#endif + ! This is almost the same as memchr, but it can ! stay as a special. #if __FIRST_ARG_IN_AX__ |