Merge branch 'master' of bitbucket.org:nuttx/nuttx
This commit is contained in:
commit
662f520c37
@ -108,7 +108,7 @@ typedef struct sem_s sem_t;
|
|||||||
{(c), 0, NULL} /* semcount, flags, hhead */
|
{(c), 0, NULL} /* semcount, flags, hhead */
|
||||||
# else
|
# else
|
||||||
# define SEM_INITIALIZER(c) \
|
# define SEM_INITIALIZER(c) \
|
||||||
{(c), 0, SEMHOLDER_INITIALIZER, SEMHOLDER_INITIALIZER} /* semcount, flags, holder[2] */
|
{(c), 0, {SEMHOLDER_INITIALIZER, SEMHOLDER_INITIALIZER}} /* semcount, flags, holder[2] */
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
# define SEM_INITIALIZER(c) \
|
# define SEM_INITIALIZER(c) \
|
||||||
|
@ -158,7 +158,7 @@ static FAR struct semholder_s *sem_findholder(sem_t *sem,
|
|||||||
|
|
||||||
for (i = 0; i < 2; i++)
|
for (i = 0; i < 2; i++)
|
||||||
{
|
{
|
||||||
pholder = &sem->pholder[i];
|
pholder = &sem->holder[i];
|
||||||
if (pholder->htcb == htcb)
|
if (pholder->htcb == htcb)
|
||||||
{
|
{
|
||||||
/* Got it! */
|
/* Got it! */
|
||||||
|
Loading…
Reference in New Issue
Block a user