3 files changed, 19 insertions, 28 deletions

diff --git a/NxWidgets/UnitTests/CImage/cimage_main.cxx b/NxWidgets/UnitTests/CImage/cimage_main.cxx
index 74bfd767f..b4d6fce65 100644
--- a/NxWidgets/UnitTests/CImage/cimage_main.cxx
+++ b/NxWidgets/UnitTests/CImage/cimage_main.cxx
@@ -86,13 +86,13 @@ extern "C" int cimage_main(int argc, char *argv[]);
 static void showMemoryUsage(FAR struct mallinfo *mmbefore,
                             FAR struct mallinfo *mmafter)
 {
-  message("VARIABLE  BEFORE   AFTER\n");
-  message("======== ======== ========\n");
-  message("arena    %8d %8d\n", mmbefore->arena,    mmafter->arena);
-  message("ordblks  %8d %8d\n", mmbefore->ordblks,  mmafter->ordblks);
-  message("mxordblk %8d %8d\n", mmbefore->mxordblk, mmafter->mxordblk);
-  message("uordblks %8d %8d\n", mmbefore->uordblks, mmafter->uordblks);
-  message("fordblks %8d %8d\n", mmbefore->fordblks, mmafter->fordblks);
+  printf("VARIABLE  BEFORE   AFTER\n");
+  printf("======== ======== ========\n");
+  printf("arena    %8d %8d\n", mmbefore->arena,    mmafter->arena);
+  printf("ordblks  %8d %8d\n", mmbefore->ordblks,  mmafter->ordblks);
+  printf("mxordblk %8d %8d\n", mmbefore->mxordblk, mmafter->mxordblk);
+  printf("uordblks %8d %8d\n", mmbefore->uordblks, mmafter->uordblks);
+  printf("fordblks %8d %8d\n", mmbefore->fordblks, mmafter->fordblks);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -114,7 +114,7 @@ static void updateMemoryUsage(FAR struct mallinfo *previous,
 
   /* Show the change from the previous time */
 
-  message("\n%s:\n", msg);
+  printf("\n%s:\n", msg);
   showMemoryUsage(previous, &mmcurrent);
 
   /* Set up for the next test */
@@ -157,16 +157,16 @@ int cimage_main(int argc, char *argv[])
 
   // Create an instance of the font test
 
-  message("cimage_main: Create CImageTest instance\n");
+  printf("cimage_main: Create CImageTest instance\n");
   CImageTest *test = new CImageTest();
   updateMemoryUsage(&g_mmprevious, "After creating CImageTest");
 
   // Connect the NX server
 
-  message("cimage_main: Connect the CImageTest instance to the NX server\n");
+  printf("cimage_main: Connect the CImageTest instance to the NX server\n");
   if (!test->connect())
     {
-      message("cimage_main: Failed to connect the CImageTest instance to the NX server\n");
+      printf("cimage_main: Failed to connect the CImageTest instance to the NX server\n");
       delete test;
       return 1;
     }
@@ -174,10 +174,10 @@ int cimage_main(int argc, char *argv[])
 
   // Create a window to draw into
 
-  message("cimage_main: Create a Window\n");
+  printf("cimage_main: Create a Window\n");
   if (!test->createWindow())
     {
-      message("cimage_main: Failed to create a window\n");
+      printf("cimage_main: Failed to create a window\n");
       delete test;
       return 1;
     }
@@ -193,7 +193,7 @@ int cimage_main(int argc, char *argv[])
   CImage *image = test->createImage(static_cast<IBitmap*>(nuttxBitmap));
   if (!image)
     {
-      message("cimage_main: Failed to create a image\n");
+      printf("cimage_main: Failed to create a image\n");
       delete test;
       return 1;
     }
@@ -207,7 +207,7 @@ int cimage_main(int argc, char *argv[])
 
   // Clean up and exit
 
-  message("cimage_main: Clean-up and exit\n");
+  printf("cimage_main: Clean-up and exit\n");
   delete image;
   updateMemoryUsage(&g_mmprevious, "After deleting CImage");
 
diff --git a/NxWidgets/UnitTests/CImage/cimagetest.cxx b/NxWidgets/UnitTests/CImage/cimagetest.cxx
index 48814c4ce..c141b4fa5 100644
--- a/NxWidgets/UnitTests/CImage/cimagetest.cxx
+++ b/NxWidgets/UnitTests/CImage/cimagetest.cxx
@@ -104,7 +104,7 @@ bool CImageTest::connect(void)
 
       if (!setBackgroundColor(CONFIG_CIMAGETEST_BGCOLOR))
         {
-          message("CImageTest::connect: setBackgroundColor failed\n");
+          printf("CImageTest::connect: setBackgroundColor failed\n");
         }
     }
 
@@ -158,7 +158,7 @@ bool CImageTest::createWindow(void)
   m_bgWindow = getBgWindow(m_widgetControl);
   if (!m_bgWindow)
     {
-      message("CImageTest::createGraphics: Failed to create CBgWindow instance\n");
+      printf("CImageTest::createGraphics: Failed to create CBgWindow instance\n");
       delete m_widgetControl;
       return false;
     }
@@ -168,7 +168,7 @@ bool CImageTest::createWindow(void)
   bool success = m_bgWindow->open();
   if (!success)
     {
-      message("CImageTest::createGraphics: Failed to open background window\n");
+      printf("CImageTest::createGraphics: Failed to open background window\n");
       delete m_bgWindow;
       m_bgWindow = (CBgWindow*)0;
       return false;
@@ -186,7 +186,7 @@ CImage *CImageTest::createImage(IBitmap *bitmap)
   struct nxgl_size_s windowSize;
   if (!m_bgWindow->getSize(&windowSize))
     {
-      message("CImageTest::createGraphics: Failed to get window size\n");
+      printf("CImageTest::createGraphics: Failed to get window size\n");
       return (CImage *)NULL;
     }
 
diff --git a/NxWidgets/UnitTests/CImage/cimagetest.hxx b/NxWidgets/UnitTests/CImage/cimagetest.hxx
index 5b5901bb1..6bef55e4c 100644
--- a/NxWidgets/UnitTests/CImage/cimagetest.hxx
+++ b/NxWidgets/UnitTests/CImage/cimagetest.hxx
@@ -71,15 +71,6 @@
 #  define CONFIG_CIMAGETEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
 #endif
 
-// If debug is enabled, use the debug function, syslog() instead
-// of printf() so that the output is synchronized.
-
-#ifdef CONFIG_DEBUG
-#  define message lowsyslog
-#else
-#  define message printf
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 // Public Classes
 /////////////////////////////////////////////////////////////////////////////