From faba0249c1e990480fd31af35e0ce63b2ed64fee Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 15 Jun 2020 15:02:49 +0900 Subject: [PATCH] Include malloc.h instead of stdlib.h for mallinfo() Adapt to the change in the main repo. mallinfo is meant to be API compatible with Linux, where it's provided by malloc.h. (I think the API actually originated with System V. I don't remember how it was there though. Anyway, I guess the compatibility with Linux is more important than System V these days.) --- examples/configdata/configdata_main.c | 1 + examples/elf/elf_main.c | 1 + examples/posix_spawn/spawn_main.c | 1 + examples/stat/stat_main.c | 1 + examples/usrsocktest/usrsocktest_main.c | 1 + graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx | 1 + graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx | 1 + graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx | 1 + .../CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx | 1 + graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx | 1 + graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx | 1 + .../UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx | 1 + graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx | 1 + graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx | 1 + graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx | 1 + .../CScrollbarHorizontal/cscrollbarhorizontal_main.cxx | 1 + .../UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx | 1 + .../UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx | 1 + .../UnitTests/CSliderVertical/cslidervertical_main.cxx | 1 + netutils/thttpd/thttpd_alloc.c | 1 + system/composite/composite.h | 2 +- system/composite/composite_main.c | 1 + system/usbmsc/usbmsc.h | 2 +- system/usbmsc/usbmsc_main.c | 1 + testing/fstest/fstest_main.c | 1 + testing/mm/mm_main.c | 1 + testing/nxffs/nxffs_main.c | 1 + testing/ostest/ostest_main.c | 1 + testing/smart/smart_main.c | 1 + 29 files changed, 29 insertions(+), 2 deletions(-) diff --git a/examples/configdata/configdata_main.c b/examples/configdata/configdata_main.c index 67ca4776b..63bfef88f 100644 --- a/examples/configdata/configdata_main.c +++ b/examples/configdata/configdata_main.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/elf/elf_main.c b/examples/elf/elf_main.c index c6872e6c2..bdeba4f82 100644 --- a/examples/elf/elf_main.c +++ b/examples/elf/elf_main.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c index 4b454217a..4991d386c 100644 --- a/examples/posix_spawn/spawn_main.c +++ b/examples/posix_spawn/spawn_main.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include diff --git a/examples/stat/stat_main.c b/examples/stat/stat_main.c index c41e94b99..8386357c2 100644 --- a/examples/stat/stat_main.c +++ b/examples/stat/stat_main.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/examples/usrsocktest/usrsocktest_main.c b/examples/usrsocktest/usrsocktest_main.c index ba9b3bc77..f4ed34441 100644 --- a/examples/usrsocktest/usrsocktest_main.c +++ b/examples/usrsocktest/usrsocktest_main.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx index 374cbf5a7..13692fa70 100644 --- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx +++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx index 8cd366393..a4dd417c4 100644 --- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx +++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx index 2a74fb370..f08da13e0 100644 --- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx index 13badfbaa..c3bfa04c9 100644 --- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx +++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx index 5f6686333..fc5e29b15 100644 --- a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx +++ b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx index 9e1036d11..a20fca694 100644 --- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx +++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx index 0ba1be0d1..209b6cd09 100644 --- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx +++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx index 445b41679..07a67312a 100644 --- a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx +++ b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx index 8f1b3ee6d..74ab8b91c 100644 --- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx +++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx index e37b12fac..0953e3441 100644 --- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx index 6fdc078cb..344e84cca 100644 --- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx index a1449db42..01b957a20 100644 --- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx index cf855ecae..33c19c668 100644 --- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx +++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx index 7728b70af..621c30739 100644 --- a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx +++ b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/netutils/thttpd/thttpd_alloc.c b/netutils/thttpd/thttpd_alloc.c index de59dc9bf..2ba50e94c 100644 --- a/netutils/thttpd/thttpd_alloc.c +++ b/netutils/thttpd/thttpd_alloc.c @@ -26,6 +26,7 @@ #include #include +#include #include #include diff --git a/system/composite/composite.h b/system/composite/composite.h index 3342b6821..765ee4bd1 100644 --- a/system/composite/composite.h +++ b/system/composite/composite.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include +#include /**************************************************************************** * Pre-Processor Definitions diff --git a/system/composite/composite_main.c b/system/composite/composite_main.c index 66e1b39ab..0670a45b7 100644 --- a/system/composite/composite_main.c +++ b/system/composite/composite_main.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/system/usbmsc/usbmsc.h b/system/usbmsc/usbmsc.h index b9d99cf4e..2fb5d935e 100644 --- a/system/usbmsc/usbmsc.h +++ b/system/usbmsc/usbmsc.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include +#include /**************************************************************************** * Pre-Processor Definitions diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c index e2db35a86..417beba9f 100644 --- a/system/usbmsc/usbmsc_main.c +++ b/system/usbmsc/usbmsc_main.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/testing/fstest/fstest_main.c b/testing/fstest/fstest_main.c index bac7a8580..13ac6f627 100644 --- a/testing/fstest/fstest_main.c +++ b/testing/fstest/fstest_main.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/testing/mm/mm_main.c b/testing/mm/mm_main.c index 52fb05954..1147bbd43 100644 --- a/testing/mm/mm_main.c +++ b/testing/mm/mm_main.c @@ -39,6 +39,7 @@ #include #include +#include #include /**************************************************************************** diff --git a/testing/nxffs/nxffs_main.c b/testing/nxffs/nxffs_main.c index 58a7a223a..0fbd31e2e 100644 --- a/testing/nxffs/nxffs_main.c +++ b/testing/nxffs/nxffs_main.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c index feacf35d1..f10184119 100644 --- a/testing/ostest/ostest_main.c +++ b/testing/ostest/ostest_main.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/testing/smart/smart_main.c b/testing/smart/smart_main.c index 963baa174..fe7e3ee67 100644 --- a/testing/smart/smart_main.c +++ b/testing/smart/smart_main.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include