diff options
| author | Robert de Bath <rdebath@poboxes.com> | 2002-08-11 08:50:48 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2013-10-23 23:48:48 +0200 |
| commit | 26ade8d624457b7164502ed9c190ca3f146bda0c (patch) | |
| tree | 75a70b6a562bc595c971e170994a8e302a8c7b3b /libc | |
| parent | 660429af0232d4afcb3e03fb0437053dd6e16286 (diff) | |
| download | dev86-26ade8d624457b7164502ed9c190ca3f146bda0c.tar.gz | |
Import Dev86src-0.16.8.tar.gzv0.16.8
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/bios/Makefile | 2 | ||||
| -rw-r--r-- | libc/bios/bios_disk.c | 6 | ||||
| -rw-r--r-- | libc/include/stdarg.h | 2 | ||||
| -rw-r--r-- | libc/include/stdlib.h | 13 | ||||
| -rw-r--r-- | libc/string/string.c | 1 |
5 files changed, 15 insertions, 9 deletions
diff --git a/libc/bios/Makefile b/libc/bios/Makefile index 692d535..ffa5027 100644 --- a/libc/bios/Makefile +++ b/libc/bios/Makefile @@ -15,7 +15,7 @@ CSRC=bios_min.c COBJ=bios_putc.o bios_getc.o DSRC=bios_disk.c -DOBJ=bios_disk_read.o bios_disk_write.o bios_disk_reset.o bios_get_dpt.o +DOBJ=bios_disk_rd.o bios_disk_wr.o bios_disk_rs.o bios_get_dpt.o OBJ=$(AOBJ) $(BOBJ) $(COBJ) $(DOBJ) \ time.o fileops.o fs_dos.o rawio.o vt52.o ansi.o diff --git a/libc/bios/bios_disk.c b/libc/bios/bios_disk.c index e0d9961..49b4ec6 100644 --- a/libc/bios/bios_disk.c +++ b/libc/bios/bios_disk.c @@ -5,7 +5,7 @@ #include <bios.h> #include <errno.h> -#ifdef L_bios_disk_read +#ifdef L_bios_disk_rd _bios_disk_read(drive, cyl, head, sect, length, buffer) { #asm @@ -52,7 +52,7 @@ read_err1: } #endif -#ifdef L_bios_disk_write +#ifdef L_bios_disk_wr _bios_disk_write(drive, cyl, head, sect, length, buffer) { #asm @@ -127,7 +127,7 @@ func_ok: } #endif -#ifdef L_bios_disk_reset +#ifdef L_bios_disk_rs _bios_disk_reset(drive) { #asm diff --git a/libc/include/stdarg.h b/libc/include/stdarg.h index 321e664..f5f6fbf 100644 --- a/libc/include/stdarg.h +++ b/libc/include/stdarg.h @@ -43,5 +43,5 @@ #endif /* __STDARG_H */ #if __FIRST_ARG_IN_AX__ -#error First arg is in a register, stdarg.h cannot take its address +#warning First arg is in a register, stdarg.h cannot take its address #endif diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h index 7831424..aeb7a43 100644 --- a/libc/include/stdlib.h +++ b/libc/include/stdlib.h @@ -14,10 +14,7 @@ #define EXIT_FAILURE 1 #define EXIT_SUCCESS 0 -extern void * malloc __P ((size_t)); -extern void * calloc __P ((size_t, size_t)); -extern void free __P ((void *)); -extern void * realloc __P ((void *, size_t)); +#include <malloc.h> extern int rand __P ((void)); extern void srand __P ((unsigned int seed)); @@ -29,6 +26,10 @@ extern unsigned long strtoul __P ((const char * nptr, extern double strtod __P ((const char * nptr, char ** endptr)); #endif +extern long int atol __P ((__const char *__nptr)); +extern double atof __P ((__const char *__nptr)); +extern int atoi __P ((__const char *__nptr)); + /* Returned by `div'. */ typedef struct { @@ -43,4 +44,8 @@ typedef struct long int rem; /* Remainder. */ } ldiv_t; + +extern char *getenv __P ((__const char *__name)); +extern char *mktemp __P ((char *__template)); + #endif /* __STDLIB_H */ diff --git a/libc/string/string.c b/libc/string/string.c index 705ec55..d672e77 100644 --- a/libc/string/string.c +++ b/libc/string/string.c @@ -139,6 +139,7 @@ sc_1: xor ax,ax ; so return zero jmp sc_3 sc_2: + cmc sbb ax,ax ; Collect correct val (-1,1). orb al,#1 sc_3: |