apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-18 17:32:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

apps: Remove all stuff related to CONFIG_xxx_CXXINITIALIZE

Browse Source 
since it is moved to the central place in nuttx side instead

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I544d6110f1ca6460f7c82f970870aa9b1e7ab3dd
This commit is contained in:
Xiang Xiao
2020-06-30 20:57:45 +08:00
committed by patacongo
parent 989d1aef13
commit b217de70e5
22 changed files with 13 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
examples/nxterm/nxterm_main.c
View File

@@ -63,7 +63,6 @@
#include <nuttx/nx/nxfonts.h>
#include <nuttx/nx/nxterm.h>
#include "platform/cxxinitialize.h"
#include "nshlib/nshlib.h"
#include "nxterm_internal.h"
@@ -117,7 +116,8 @@ static int nxterm_initialize(void)
ret = boardctl(BOARDIOC_NX_START, 0);
if (ret < 0)
{
printf("nxterm_initialize: Failed to start the NX server: %d\n", errno);
printf("nxterm_initialize: Failed to start the NX server: %d\n",
errno);
return ERROR;
}
@@ -145,9 +145,9 @@ static int nxterm_initialize(void)
}
#endif
/* Start a separate thread to listen for server events. This is probably
* the least efficient way to do this, but it makes this example flow more
* smoothly.
/* Start a separate thread to listen for server events. This is
* probably the least efficient way to do this, but it makes this
* example flow more smoothly.
*/
pthread_attr_init(&attr);
@@ -230,12 +230,6 @@ int main(int argc, FAR char *argv[])
printf("nxterm_main: Started\n");
memset(&g_nxterm_vars, 0, sizeof(struct nxterm_state_s));
/* Call all C++ static constructors */
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
up_cxxinitialize();
#endif
/* NSH Initialization *****************************************************/
/* Initialize the NSH library */
@@ -312,8 +306,10 @@ int main(int argc, FAR char *argv[])
/* Determine the size and position of the window */
g_nxterm_vars.wndo.wsize.w = g_nxterm_vars.xres / 2 + g_nxterm_vars.xres / 4;
g_nxterm_vars.wndo.wsize.h = g_nxterm_vars.yres / 2 + g_nxterm_vars.yres / 4;
g_nxterm_vars.wndo.wsize.w = g_nxterm_vars.xres / 2 +
g_nxterm_vars.xres / 4;
g_nxterm_vars.wndo.wsize.h = g_nxterm_vars.yres / 2 +
g_nxterm_vars.yres / 4;
g_nxterm_vars.wpos.x = g_nxterm_vars.xres / 8;
g_nxterm_vars.wpos.y = g_nxterm_vars.yres / 8;