Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Move include/nuttx/stdarg.h to include/nuttx/lib/stdarg.h

Browse Source
This commit is contained in:
Gregory Nutt
2016-07-21 13:48:20 -06:00
parent 72a45c82b7
commit ea589e2d6c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kconfig
+2 -2
View File
@@ -371,7 +371,7 @@ config ARCH_STDARG_H
default n default n
---help--- ---help---
There is also a redirecting version of stdarg.h in the source tree There is also a redirecting version of stdarg.h in the source tree
as well. It also resides out-of-the-way at include/nuttx/stdarg.h. as well. It also resides out-of-the-way at include/nuttx/lib/stdarg.h.
This is because you should normally use your toolchain's stdarg.h This is because you should normally use your toolchain's stdarg.h
file. But sometimes, your toolchain's stdarg.h file may have other file. But sometimes, your toolchain's stdarg.h file may have other
header file dependencies and so may not be usable in the NuttX build header file dependencies and so may not be usable in the NuttX build
@@ -379,7 +379,7 @@ config ARCH_STDARG_H
specific stdarg.h header file at nuttx/arch/<architecture>/include/stdarg.h specific stdarg.h header file at nuttx/arch/<architecture>/include/stdarg.h
If ARCH_STDARG_H=y is defined, the top-level makefile will copy the If ARCH_STDARG_H=y is defined, the top-level makefile will copy the
re-directing stdarg.h header file from include/nuttx/stdarg.h to re-directing stdarg.h header file from include/nuttx/lib/stdarg.h to
include/stdarg.h. So for the architectures that cannot use their include/stdarg.h. So for the architectures that cannot use their
toolchain's stdarg.h file, they can use this alternative by defining toolchain's stdarg.h file, they can use this alternative by defining
ARCH_STDARG_H=y and providing. If ARCH_STDARG_H, is not defined, then ARCH_STDARG_H=y and providing. If ARCH_STDARG_H, is not defined, then
Makefile.unix
+4 -4
View File
@@ -227,14 +227,14 @@ else
include/float.h: include/float.h:
endif endif
# Target used to copy include/nuttx/stdarg.h. If CONFIG_ARCH_STDARG_H is # Target used to copy include/nuttx/lib/stdarg.h. If CONFIG_ARCH_STDARG_H is
# defined, then there is an architecture specific stdarg.h header file # defined, then there is an architecture specific stdarg.h header file
# that will be included indirectly from include/stdarg.h. But first, we # that will be included indirectly from include/lib/stdarg.h. But first, we
# have to copy stdarg.h from include/nuttx/. to include/. # have to copy stdarg.h from include/nuttx/. to include/.
ifeq ($(CONFIG_ARCH_STDARG_H),y) ifeq ($(CONFIG_ARCH_STDARG_H),y)
include/stdarg.h: include/nuttx/stdarg.h include/stdarg.h: include/nuttx/lib/stdarg.h
$(Q) cp -f include/nuttx/stdarg.h include/stdarg.h $(Q) cp -f include/nuttx/lib/stdarg.h include/stdarg.h
else else
include/stdarg.h: include/stdarg.h:
endif endif
include/nuttx/stdarg.h → include/nuttx/lib/stdarg.h
+5 -5
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* include/nuttx/stdarg.h * include/nuttx/lib/stdarg.h
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __INCLUDE_NUTTX_STDARG_H #ifndef __INCLUDE_NUTTX_LIB_STDARG_H
#define __INCLUDE_NUTTX_STDARG_H #define __INCLUDE_NUTTX_LIB_STDARG_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@@ -61,4 +61,4 @@
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/
#endif /* __INCLUDE_NUTTX_STDARG_H */ #endif /* __INCLUDE_NUTTX_LIB_STDARG_H */