Merge remote-tracking branch 'origin/master' into ieee802154
This commit is contained in:
commit
9397552ef8
@ -80,7 +80,7 @@ ifeq ($(CONFIG_FS_NAMED_SEMAPHORES),y)
|
||||
CSRCS += nsem.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_MUTEX_TYPES),y)
|
||||
ifeq ($(CONFIG_PTHREAD_MUTEX_TYPES),y)
|
||||
CSRCS += rmutex.c
|
||||
endif
|
||||
|
||||
|
@ -373,7 +373,7 @@ static int user_main(int argc, char *argv[])
|
||||
check_test_memory_usage();
|
||||
#endif
|
||||
|
||||
#if !defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_MUTEX_TYPES)
|
||||
#if !defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_PTHREAD_MUTEX_TYPES)
|
||||
/* Verify recursive mutexes */
|
||||
|
||||
printf("\nuser_main: recursive mutex test\n");
|
||||
|
Loading…
Reference in New Issue
Block a user