diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1996-05-23 15:37:38 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1996-05-23 15:37:38 +0000 |
commit | 8b2ecf8546179dcdabbe691338ebcf3a43960663 (patch) | |
tree | 5837256081cce6ea30474b5cdbbf26f6821b362e /c/src/lib | |
parent | added code to insure that delay is always non-zero (diff) | |
download | rtems-8b2ecf8546179dcdabbe691338ebcf3a43960663.tar.bz2 |
updates from Tony Bennett
Diffstat (limited to 'c/src/lib')
-rw-r--r-- | c/src/lib/libc/libio.c | 2 | ||||
-rw-r--r-- | c/src/lib/libc/malloc.c | 3 | ||||
-rw-r--r-- | c/src/lib/libc/newlibc.c | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/hppa1.1/timer/timer.c | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/c/src/lib/libc/libio.c b/c/src/lib/libc/libio.c index a01dea7b8a..202d1f9275 100644 --- a/c/src/lib/libc/libio.c +++ b/c/src/lib/libc/libio.c @@ -15,7 +15,7 @@ #if defined(solaris2) #define O_NDELAY O_NONBLOCK -#elif defined(RTEMS_NEWLIB) +#elif defined(RTEMS_NEWLIB) #define O_NDELAY _FNBIO #endif diff --git a/c/src/lib/libc/malloc.c b/c/src/lib/libc/malloc.c index de63df6ea0..d1a80b431f 100644 --- a/c/src/lib/libc/malloc.c +++ b/c/src/lib/libc/malloc.c @@ -252,6 +252,9 @@ void *realloc( } new_area = malloc( size ); + + MSBUMP(malloc_calls, -1); /* subtract off the malloc */ + if ( !new_area ) { free( ptr ); return (void *) 0; diff --git a/c/src/lib/libc/newlibc.c b/c/src/lib/libc/newlibc.c index 8c9ed2e1a8..0e38845ecf 100644 --- a/c/src/lib/libc/newlibc.c +++ b/c/src/lib/libc/newlibc.c @@ -131,7 +131,7 @@ libc_start_hook(rtems_tcb *current_task, * real target. */ -#ifdef RTEMS_UNIX +#ifdef NEED_SETVBUF rtems_extension libc_begin_hook(rtems_tcb *current_task) { @@ -274,7 +274,7 @@ libc_init(int reentrant) libc_extension.thread_create = libc_create_hook; libc_extension.thread_start = libc_start_hook; -#ifdef RTEMS_UNIX +#ifdef NEED_SETVBUF libc_extension.thread_begin = libc_begin_hook; #endif libc_extension.thread_switch = libc_switch_hook; diff --git a/c/src/lib/libcpu/hppa1.1/timer/timer.c b/c/src/lib/libcpu/hppa1.1/timer/timer.c index caa04bd282..104b108f2a 100644 --- a/c/src/lib/libcpu/hppa1.1/timer/timer.c +++ b/c/src/lib/libcpu/hppa1.1/timer/timer.c @@ -24,6 +24,7 @@ rtems_boolean Timer_driver_Find_average_overhead; void Timer_initialize() { Timer_starting = get_itimer(); + set_eiem(0x80000000); } #define AVG_OVERHEAD 0 /* It typically takes 3.0 microseconds */ |