Fixed bug 3576771.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@4757 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2012-10-13 11:01:38 +00:00
parent 494c4d399e
commit 96e883f2bb
2 changed files with 6 additions and 0 deletions

View File

@ -140,6 +140,7 @@ int _close_r(struct _reent *r, int file)
caddr_t _sbrk_r(struct _reent *r, int incr) caddr_t _sbrk_r(struct _reent *r, int incr)
{ {
#if CH_USE_MEMCORE
void *p; void *p;
chDbgCheck(incr > 0, "_sbrk_r"); chDbgCheck(incr > 0, "_sbrk_r");
@ -151,6 +152,10 @@ caddr_t _sbrk_r(struct _reent *r, int incr)
return (caddr_t)-1; return (caddr_t)-1;
} }
return (caddr_t)p; return (caddr_t)p;
#else
__errno_r(r) = ENOMEM;
return (caddr_t)-1;
#endif
} }
/***************************************************************************/ /***************************************************************************/

View File

@ -79,6 +79,7 @@
***************************************************************************** *****************************************************************************
*** 2.4.3 *** *** 2.4.3 ***
- FIX: Fixed compilation issue in syscalls.c (bug 3575657).
- FIX: Fixed superfluous pack #defines cause nasty warning (bug 3575662). - FIX: Fixed superfluous pack #defines cause nasty warning (bug 3575662).
- FIX: Fixed mac.c won't compile due to misplaced declarations (bug 3575657). - FIX: Fixed mac.c won't compile due to misplaced declarations (bug 3575657).
- FIX: Fixed STM32F4 ADC prescaler incorrectly initialized (bug 3575297). - FIX: Fixed STM32F4 ADC prescaler incorrectly initialized (bug 3575297).