You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/06/15 13:22:01 UTC
[incubator-nuttx-apps] branch master updated: Include malloc.h
instead of stdlib.h for mallinfo()
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new faba024 Include malloc.h instead of stdlib.h for mallinfo()
faba024 is described below
commit faba0249c1e990480fd31af35e0ce63b2ed64fee
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Mon Jun 15 15:02:49 2020 +0900
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 +
.../UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx | 1 +
graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx | 1 +
graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx | 1 +
.../nxwidgets/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 +
.../UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx | 1 +
.../nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx | 1 +
.../nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx | 1 +
graphics/nxwidgets/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 67ca477..63bfef8 100644
--- a/examples/configdata/configdata_main.c
+++ b/examples/configdata/configdata_main.c
@@ -42,6 +42,7 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
diff --git a/examples/elf/elf_main.c b/examples/elf/elf_main.c
index c6872e6..bdeba4f 100644
--- a/examples/elf/elf_main.c
+++ b/examples/elf/elf_main.c
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <unistd.h>
#include <string.h>
#include <pthread.h>
diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c
index 4b45421..4991d38 100644
--- a/examples/posix_spawn/spawn_main.c
+++ b/examples/posix_spawn/spawn_main.c
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
diff --git a/examples/stat/stat_main.c b/examples/stat/stat_main.c
index c41e94b..8386357 100644
--- a/examples/stat/stat_main.c
+++ b/examples/stat/stat_main.c
@@ -27,6 +27,7 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <string.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/examples/usrsocktest/usrsocktest_main.c b/examples/usrsocktest/usrsocktest_main.c
index ba9b3bc..f4ed344 100644
--- a/examples/usrsocktest/usrsocktest_main.c
+++ b/examples/usrsocktest/usrsocktest_main.c
@@ -42,6 +42,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
+#include <malloc.h>
#include <stdio.h>
#include <debug.h>
#include <fcntl.h>
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
index 374cbf5..13692fa 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
@@ -27,6 +27,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cstdlib>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
index 8cd3663..a4dd417 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
index 2a74fb3..f08da13 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
index 13badfb..c3bfa04 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
index 5f66863..fc5e29b 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
index 9e1036d..a20fca6 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
@@ -27,6 +27,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cstdlib>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
index 0ba1be0..209b6cd 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
@@ -27,6 +27,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cstdlib>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
index 445b416..07a6731 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
index 8f1b3ee..74ab8b9 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
index e37b12f..0953e34 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
index 6fdc078..344e84c 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
index a1449db..01b957a 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
index cf855ec..33c19c6 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
index 7728b70..621c307 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
@@ -28,6 +28,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/netutils/thttpd/thttpd_alloc.c b/netutils/thttpd/thttpd_alloc.c
index de59dc9..2ba50e9 100644
--- a/netutils/thttpd/thttpd_alloc.c
+++ b/netutils/thttpd/thttpd_alloc.c
@@ -26,6 +26,7 @@
#include <sys/types.h>
#include <stdlib.h>
+#include <malloc.h>
#include <debug.h>
#include <errno.h>
diff --git a/system/composite/composite.h b/system/composite/composite.h
index 3342b68..765ee4b 100644
--- a/system/composite/composite.h
+++ b/system/composite/composite.h
@@ -41,7 +41,7 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <stdlib.h>
+#include <malloc.h>
/****************************************************************************
* Pre-Processor Definitions
diff --git a/system/composite/composite_main.c b/system/composite/composite_main.c
index 66e1b39..0670a45 100644
--- a/system/composite/composite_main.c
+++ b/system/composite/composite_main.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/system/usbmsc/usbmsc.h b/system/usbmsc/usbmsc.h
index b9d99cf..2fb5d93 100644
--- a/system/usbmsc/usbmsc.h
+++ b/system/usbmsc/usbmsc.h
@@ -41,7 +41,7 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <stdlib.h>
+#include <malloc.h>
/****************************************************************************
* Pre-Processor Definitions
diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c
index e2db35a..417beba 100644
--- a/system/usbmsc/usbmsc_main.c
+++ b/system/usbmsc/usbmsc_main.c
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdbool.h>
#include <stdlib.h>
+#include <malloc.h>
#include <unistd.h>
#include <debug.h>
diff --git a/testing/fstest/fstest_main.c b/testing/fstest/fstest_main.c
index bac7a85..13ac6f6 100644
--- a/testing/fstest/fstest_main.c
+++ b/testing/fstest/fstest_main.c
@@ -31,6 +31,7 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>
diff --git a/testing/mm/mm_main.c b/testing/mm/mm_main.c
index 52fb059..1147bbd 100644
--- a/testing/mm/mm_main.c
+++ b/testing/mm/mm_main.c
@@ -39,6 +39,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <string.h>
/****************************************************************************
diff --git a/testing/nxffs/nxffs_main.c b/testing/nxffs/nxffs_main.c
index 58a7a22..0fbd31e 100644
--- a/testing/nxffs/nxffs_main.c
+++ b/testing/nxffs/nxffs_main.c
@@ -29,6 +29,7 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index feacf35..f101841 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -28,6 +28,7 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <unistd.h>
#include <signal.h>
#include <string.h>
diff --git a/testing/smart/smart_main.c b/testing/smart/smart_main.c
index 963baa1..fe7e3ee 100644
--- a/testing/smart/smart_main.c
+++ b/testing/smart/smart_main.c
@@ -29,6 +29,7 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <malloc.h>
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>