summaryrefslogtreecommitdiff
path: root/NxWidgets/nxwm
diff options
context:
space:
mode:
Diffstat (limited to 'NxWidgets/nxwm')
-rw-r--r--NxWidgets/nxwm/include/nxwmconfig.hxx6
-rw-r--r--NxWidgets/nxwm/src/cnxconsole.cxx12
2 files changed, 9 insertions, 9 deletions
diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx
index b2c3f4c54..a0b91e0ef 100644
--- a/NxWidgets/nxwm/include/nxwmconfig.hxx
+++ b/NxWidgets/nxwm/include/nxwmconfig.hxx
@@ -57,7 +57,7 @@
* CONFIG_HAVE_CXX : C++ support is required
* CONFIG_NX : NX must enabled
* CONFIG_NX_MULTIUSER=y : NX must be configured in multiuse mode
- * CONFIG_NXCONSOLE=y : For NxConsole support
+ * CONFIG_NXTERM=y : For NxConsole support
* CONFIG_SCHED_ONEXIT : Support for on_exit()
*
* General settings:
@@ -89,8 +89,8 @@
* selected
*/
-#if defined(CONFIG_NXWM_NXCONSOLE) && !defined(CONFIG_NXCONSOLE)
-# warning "NxConsole support may be needed (CONFIG_NXCONSOLE)"
+#if defined(CONFIG_NXWM_NXCONSOLE) && !defined(CONFIG_NXTERM)
+# warning "NxConsole support may be needed (CONFIG_NXTERM)"
#endif
/**
diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx
index be0718a10..f2449e6b1 100644
--- a/NxWidgets/nxwm/src/cnxconsole.cxx
+++ b/NxWidgets/nxwm/src/cnxconsole.cxx
@@ -278,7 +278,7 @@ bool CNxConsole::run(void)
// Re-direct NX keyboard input to the new NxConsole driver
DEBUGASSERT(g_nxconvars.nxcon != 0);
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
window->redirectNxConsole(g_nxconvars.nxcon);
#endif
// Save the handle to use in the stop method
@@ -331,7 +331,7 @@ void CNxConsole::stop(void)
{
// Re-store NX keyboard input routing
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
NXWidgets::INxWindow *window = m_window->getWindow();
window->redirectNxConsole((NXCONSOLE)0);
#endif
@@ -455,7 +455,7 @@ int CNxConsole::nxconsole(int argc, char *argv[])
// Open the NxConsole driver
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
fd = open(devname, O_RDWR);
#else
fd = open(devname, O_WRONLY);
@@ -474,19 +474,19 @@ int CNxConsole::nxconsole(int argc, char *argv[])
(void)std::fflush(stdout);
(void)std::fflush(stderr);
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
(void)std::fclose(stdin);
#endif
(void)std::fclose(stdout);
(void)std::fclose(stderr);
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
(void)std::dup2(fd, 0);
#endif
(void)std::dup2(fd, 1);
(void)std::dup2(fd, 2);
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
(void)std::fdopen(0, "r");
#endif
(void)std::fdopen(1, "w");