3 files changed, 20 insertions, 30 deletions
diff --git a/NxWidgets/UnitTests/CScrollbarVertical/Makefile b/NxWidgets/UnitTests/CScrollbarVertical/Makefile
index ad7ae2a38..a2777e752 100644
--- a/NxWidgets/UnitTests/CScrollbarVertical/Makefile
+++ b/NxWidgets/UnitTests/CScrollbarVertical/Makefile
@@ -63,7 +63,7 @@ ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
 
 ASRCS		=
 CSRCS		=
-CXXSRCS		= main.cxx cscrollbarverticaltest.cxx
+CXXSRCS		= cscrollbarvertical_main.cxx cscrollbarverticaltest.cxx
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/NxWidgets/UnitTests/CScrollbarVertical/main.cxx b/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
index 16bd9eea6..26dc70dbd 100644
--- a/NxWidgets/UnitTests/CScrollbarVertical/main.cxx
+++ b/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// NxWidgets/UnitTests/CScrollbarVertical/main.cxx
+// NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
 //
 //   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 //   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -73,7 +73,7 @@ static unsigned int g_mmprevious;
 
 // Suppress name-mangling
 
-extern "C" int MAIN_NAME(int argc, char *argv[]);
+extern "C" int cscrollbarvertical_main(int argc, char *argv[]);
 
 /////////////////////////////////////////////////////////////////////////////
 // Private Functions
@@ -135,7 +135,7 @@ static void initMemoryUsage(void)
 // Name: user_start/nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
-int MAIN_NAME(int argc, char *argv[])
+int cscrollbarvertical_main(int argc, char *argv[])
 {
   // Initialize memory monitor logic
 
@@ -143,50 +143,50 @@ int MAIN_NAME(int argc, char *argv[])
 
   // Create an instance of the checkbox test
 
-  message(MAIN_STRING "Create CScrollbarVerticalTest instance\n");
+  message("cscrollbarvertical_main: Create CScrollbarVerticalTest instance\n");
   CScrollbarVerticalTest *test = new CScrollbarVerticalTest();
   updateMemoryUsage(g_mmprevious, "After creating CScrollbarVerticalTest");
 
   // Connect the NX server
 
-  message(MAIN_STRING "Connect the CScrollbarVerticalTest instance to the NX server\n");
+  message("cscrollbarvertical_main: Connect the CScrollbarVerticalTest instance to the NX server\n");
   if (!test->connect())
     {
-      message(MAIN_STRING "Failed to connect the CScrollbarVerticalTest instance to the NX server\n");
+      message("cscrollbarvertical_main: Failed to connect the CScrollbarVerticalTest instance to the NX server\n");
       delete test;
       return 1;
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After connecting to the server");
+  updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After connecting to the server");
 
   // Create a window to draw into
 
-  message(MAIN_STRING "Create a Window\n");
+  message("cscrollbarvertical_main: Create a Window\n");
   if (!test->createWindow())
     {
-      message(MAIN_STRING "Failed to create a window\n");
+      message("cscrollbarvertical_main: Failed to create a window\n");
       delete test;
       return 1;
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After creating a window");
+  updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After creating a window");
 
   // Create a scrollbar
 
-  message(MAIN_STRING "Create a Scrollbar\n");
+  message("cscrollbarvertical_main: Create a Scrollbar\n");
   CScrollbarVertical *scrollbar = test->createScrollbar();
   if (!scrollbar)
     {
-      message(MAIN_STRING "Failed to create a scrollbar\n");
+      message("cscrollbarvertical_main: Failed to create a scrollbar\n");
       delete test;
       return 1;
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After creating a scrollbar");
+  updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After creating a scrollbar");
 
   // Set the scrollbar minimum and maximum values
 
   scrollbar->setMinimumValue(0);
   scrollbar->setMaximumValue(MAX_SCROLLBAR);
   scrollbar->setValue(0);
-  message(MAIN_STRING "Scrollbar range %d->%d Initial value %d\n",
+  message("cscrollbarvertical_main: Scrollbar range %d->%d Initial value %d\n",
           scrollbar->getMinimumValue(), scrollbar->getMaximumValue(),
           scrollbar->getValue());
 
@@ -201,10 +201,10 @@ int MAIN_NAME(int argc, char *argv[])
     {
       scrollbar->setValue(i);
       test->showScrollbar(scrollbar);
-      message(MAIN_STRING "%d. New value %d\n", i, scrollbar->getValue());
+      message("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue());
       usleep(1000); // The simulation needs this to let the X11 event loop run
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After moving the scrollbar up");
+  updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After moving the scrollbar up");
 
   // And move the scrollbar down
 
@@ -212,15 +212,15 @@ int MAIN_NAME(int argc, char *argv[])
     {
       scrollbar->setValue(i);
       test->showScrollbar(scrollbar);
-      message(MAIN_STRING "%d. New value %d\n", i, scrollbar->getValue());
+      message("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue());
       usleep(5000); // The simulation needs this to let the X11 event loop run
     }
-  updateMemoryUsage(g_mmprevious, MAIN_STRING "After moving the scrollbar down");
+  updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After moving the scrollbar down");
   sleep(1);
 
   // Clean up and exit
 
-  message(MAIN_STRING "Clean-up and exit\n");
+  message("cscrollbarvertical_main: Clean-up and exit\n");
   delete scrollbar;
   updateMemoryUsage(g_mmprevious, "After deleting the scrollbar");
   delete test;
diff --git a/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx b/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
index e6005ced9..8b9fb1ee8 100644
--- a/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
+++ b/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
@@ -69,16 +69,6 @@
 #  define CONFIG_CSCROLLBARVERTICALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
 #endif
 
-// What is the entry point called?
-
-#ifdef CONFIG_NSH_BUILTIN_APPS
-#  define MAIN_NAME cscrollbarvertical_main
-#  define MAIN_STRING "cscrollbarvertical_main: "
-#else
-#  define MAIN_NAME user_start
-#  define MAIN_STRING "user_start: "
-#endif
-
 // If debug is enabled, use the debug function, lib_rawprintf() instead
 // of printf() so that the output is synchronized.