--- a/packages/infra/current/ChangeLog
+++ b/packages/infra/current/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-26  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* tests/diag_sprintf1.c: Rename main() to cyg_user_start so this
+	works in all configs.
+	* tests/diag_sprintf2.c: Ditto.
+
 2008-10-02  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* src/gccsupport.cxx (fwrite, fputc): New functions since GCC can

--- a/packages/infra/current/tests/diag_sprintf1.c
+++ b/packages/infra/current/tests/diag_sprintf1.c
@@ -9,6 +9,7 @@
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2006 eCosCentric Limited.
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -240,8 +241,7 @@ static void test(CYG_ADDRWORD data)
 
 } // test()
 
-int
-main(int argc, char *argv[])
+void cyg_user_start(void)
 {
     CYG_TEST_INIT();
 
@@ -250,8 +250,6 @@ main(int argc, char *argv[])
     CYG_TEST_INFO("These test individual features separately");
 
     test(0);
-
-    return 0;
-} // main()
+} // cyg_user_start()
 
 // EOF diag_sprintf1.c

--- a/packages/infra/current/tests/diag_sprintf2.c
+++ b/packages/infra/current/tests/diag_sprintf2.c
@@ -9,6 +9,7 @@
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2006 eCosCentric Limited.
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -143,8 +144,8 @@ test( CYG_ADDRWORD data )
 
 } // test()
 
-int
-main(int argc, char *argv[])
+void
+cyg_user_start(void)
 {
     CYG_TEST_INIT();
 
@@ -153,8 +154,6 @@ main(int argc, char *argv[])
     CYG_TEST_INFO("These test combinations of diag_sprintf() features");
 
     test(0);
-
-    return 0;
-} // main()
+} // cyg_user_start()
 
 // EOF diag_sprintf2.c