sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't build libc/pthread if pthreasa are disable. Fix a warning in dirent logic if mountpoints are disabled.

Browse Source
This commit is contained in:
Gregory Nutt 2017-02-16 09:53:13 -06:00
parent 42e8b12ec3
commit b4d378adb8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/dirent/fs_opendir.c
View File

@ -227,7 +227,9 @@ FAR DIR *opendir(FAR const char *path)
FAR struct inode *inode = NULL;
FAR struct fs_dirent_s *dir;
struct inode_search_s desc;
#ifndef CONFIG_DISABLE_MOUNTPOINT
FAR const char *relpath = NULL;
#endif
bool isroot = false;
int ret;
@ -260,7 +262,9 @@ FAR DIR *opendir(FAR const char *path)
{
inode = desc.node;
DEBUGASSERT(inode != NULL);
#ifndef CONFIG_DISABLE_MOUNTPOINT
relpath = desc.relpath;
#endif
}
}

7
libc/pthread/Make.defs
View File

@ -33,6 +33,8 @@
#
############################################################################
ifneq ($(CONFIG_DISABLE_PTHREAD),y)
# Add the pthread C files to the build
CSRCS += pthread_attr_init.c pthread_attr_destroy.c
@ -54,9 +56,6 @@ ifeq ($(CONFIG_SMP),y)
CSRCS += pthread_attr_getaffinity.c pthread_attr_setaffinity.c
endif
ifeq ($(CONFIG_MUTEX_TYPES),y)
endif
ifeq ($(CONFIG_BUILD_PROTECTED),y)
CSRCS += pthread_startup.c
endif
@ -65,3 +64,5 @@ endif
DEPPATH += --dep-path pthread
VPATH += :pthread
endif