This is the mail archive of the ecos-patches@sourceware.org mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

yet more main() fixes


This time for the string tests.

Bart

2009-01-26  Jonathan Larmour  <jifl@eCosCentric.com>

	* tests/memchr.c (main): Rename to cyg_user_start if main isn't
	going to be called.
	* tests/memcmp1.c (main): Ditto.
	* tests/memcmp2.c (main): Ditto.
	* tests/memcpy1.c (main): Ditto.
	* tests/memcpy2.c (main): Ditto.
	* tests/memmove1.c (main): Ditto.
	* tests/memmove2.c (main): Ditto.
	* tests/memset.c (main): Ditto.
        * tests/strcat1.c (main): Ditto.
        * tests/strcat2.c (main): Ditto.
        * tests/strchr.c (main): Ditto.
        * tests/strcmp1.c (main): Ditto.
        * tests/strcmp2.c (main): Ditto.
        * tests/strcoll1.c (main): Ditto.
        * tests/strcoll2.c (main): Ditto.
        * tests/strcpy1.c (main): Ditto.
        * tests/strcpy2.c (main): Ditto.
        * tests/strcspn.c (main): Ditto.
        * tests/strlen.c (main): Ditto.
        * tests/strncat1.c (main): Ditto.
        * tests/strncat2.c (main): Ditto.
        * tests/strncpy1.c (main): Ditto.
        * tests/strncpy2.c (main): Ditto.
        * tests/strpbrk.c (main): Ditto.
        * tests/strrchr.c (main): Ditto.
        * tests/strspn.c (main): Ditto.
        * tests/strstr.c (main): Ditto.
        * tests/strtok.c (main): Ditto.
        * tests/strxfrm1.c (main): Ditto.
        * tests/strxfrm2.c (main): Ditto.

Index: tests/memchr.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/memchr.c,v
retrieving revision 1.3
diff -u -p -r1.3 memchr.c
--- tests/memchr.c	23 May 2002 23:07:28 -0000	1.3
+++ tests/memchr.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -68,7 +69,11 @@ static int my_strcmp(const char *s1, con
     return (*s1 - *s2);
 } // my_strcmp()
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[] = "Your feeble skills are no match for the power of "
                "the dark side!";
Index: tests/memcmp1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/memcmp1.c,v
retrieving revision 1.3
diff -u -p -r1.3 memcmp1.c
--- tests/memcmp1.c	23 May 2002 23:07:28 -0000	1.3
+++ tests/memcmp1.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -80,7 +81,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/memcmp2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/memcmp2.c,v
retrieving revision 1.3
diff -u -p -r1.3 memcmp2.c
--- tests/memcmp2.c	23 May 2002 23:07:28 -0000	1.3
+++ tests/memcmp2.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -84,7 +85,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/memcpy1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/memcpy1.c,v
retrieving revision 1.3
diff -u -p -r1.3 memcpy1.c
--- tests/memcpy1.c	23 May 2002 23:07:28 -0000	1.3
+++ tests/memcpy1.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -92,7 +93,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/memcpy2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/memcpy2.c,v
retrieving revision 1.3
diff -u -p -r1.3 memcpy2.c
--- tests/memcpy2.c	23 May 2002 23:07:28 -0000	1.3
+++ tests/memcpy2.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -96,7 +97,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/memmove1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/memmove1.c,v
retrieving revision 1.3
diff -u -p -r1.3 memmove1.c
--- tests/memmove1.c	23 May 2002 23:07:28 -0000	1.3
+++ tests/memmove1.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -91,7 +92,11 @@ static char *my_strcpy(char *s1, const c
     return s1; 
 } // my_strcpy()
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/memmove2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/memmove2.c,v
retrieving revision 1.3
diff -u -p -r1.3 memmove2.c
--- tests/memmove2.c	23 May 2002 23:07:28 -0000	1.3
+++ tests/memmove2.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -96,7 +97,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/memset.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/memset.c,v
retrieving revision 1.3
diff -u -p -r1.3 memset.c
--- tests/memset.c	23 May 2002 23:07:28 -0000	1.3
+++ tests/memset.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -81,7 +82,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char *ret;
Index: tests/strcat1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strcat1.c,v
retrieving revision 1.3
diff -u -p -r1.3 strcat1.c
--- tests/strcat1.c	23 May 2002 23:07:29 -0000	1.3
+++ tests/strcat1.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -81,7 +82,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strcat2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strcat2.c,v
retrieving revision 1.3
diff -u -p -r1.3 strcat2.c
--- tests/strcat2.c	23 May 2002 23:07:29 -0000	1.3
+++ tests/strcat2.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -84,7 +85,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strchr.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strchr.c,v
retrieving revision 1.3
diff -u -p -r1.3 strchr.c
--- tests/strchr.c	23 May 2002 23:07:29 -0000	1.3
+++ tests/strchr.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -70,7 +71,11 @@ static int my_strcmp(const char *s1, con
 } // my_strcmp()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[] = "Your feeble skills are no match for the power of "
                "the dark side!";
Index: tests/strcmp1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strcmp1.c,v
retrieving revision 1.3
diff -u -p -r1.3 strcmp1.c
--- tests/strcmp1.c	23 May 2002 23:07:29 -0000	1.3
+++ tests/strcmp1.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -68,7 +69,11 @@ static char *my_strcpy(char *s1, const c
     return s1; 
 } // my_strcpy()
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strcmp2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strcmp2.c,v
retrieving revision 1.3
diff -u -p -r1.3 strcmp2.c
--- tests/strcmp2.c	23 May 2002 23:07:29 -0000	1.3
+++ tests/strcmp2.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -72,7 +73,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strcoll1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strcoll1.c,v
retrieving revision 1.3
diff -u -p -r1.3 strcoll1.c
--- tests/strcoll1.c	23 May 2002 23:07:29 -0000	1.3
+++ tests/strcoll1.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -70,7 +71,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strcoll2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strcoll2.c,v
retrieving revision 1.3
diff -u -p -r1.3 strcoll2.c
--- tests/strcoll2.c	23 May 2002 23:07:29 -0000	1.3
+++ tests/strcoll2.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -72,7 +73,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strcpy1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strcpy1.c,v
retrieving revision 1.3
diff -u -p -r1.3 strcpy1.c
--- tests/strcpy1.c	23 May 2002 23:07:29 -0000	1.3
+++ tests/strcpy1.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -81,7 +82,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strcpy2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strcpy2.c,v
retrieving revision 1.3
diff -u -p -r1.3 strcpy2.c
--- tests/strcpy2.c	23 May 2002 23:07:29 -0000	1.3
+++ tests/strcpy2.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -85,7 +86,11 @@ static int my_strcmp(const char *s1, con
 } // my_strcmp()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strcspn.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strcspn.c,v
retrieving revision 1.3
diff -u -p -r1.3 strcspn.c
--- tests/strcspn.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strcspn.c	28 Jan 2009 15:09:02 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -81,7 +82,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strlen.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strlen.c,v
retrieving revision 1.3
diff -u -p -r1.3 strlen.c
--- tests/strlen.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strlen.c	28 Jan 2009 15:09:02 -0000
@@ -50,13 +50,18 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
 
 // FUNCTIONS
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[]="";
     char y[]="The force is strong in this one";
Index: tests/strncat1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strncat1.c,v
retrieving revision 1.3
diff -u -p -r1.3 strncat1.c
--- tests/strncat1.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strncat1.c	28 Jan 2009 15:09:03 -0000
@@ -55,6 +55,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -98,7 +99,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strncat2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strncat2.c,v
retrieving revision 1.3
diff -u -p -r1.3 strncat2.c
--- tests/strncat2.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strncat2.c	28 Jan 2009 15:09:03 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -97,7 +98,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strncpy1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strncpy1.c,v
retrieving revision 1.3
diff -u -p -r1.3 strncpy1.c
--- tests/strncpy1.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strncpy1.c	28 Jan 2009 15:09:03 -0000
@@ -50,6 +51,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -110,8 +112,12 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int
 main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strncpy2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strncpy2.c,v
retrieving revision 1.3
diff -u -p -r1.3 strncpy2.c
--- tests/strncpy2.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strncpy2.c	28 Jan 2009 15:09:03 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -96,7 +97,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strpbrk.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strpbrk.c,v
retrieving revision 1.3
diff -u -p -r1.3 strpbrk.c
--- tests/strpbrk.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strpbrk.c	28 Jan 2009 15:09:03 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -69,7 +70,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strrchr.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strrchr.c,v
retrieving revision 1.3
diff -u -p -r1.3 strrchr.c
--- tests/strrchr.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strrchr.c	28 Jan 2009 15:09:03 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -69,7 +70,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char *ret;
Index: tests/strspn.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strspn.c,v
retrieving revision 1.3
diff -u -p -r1.3 strspn.c
--- tests/strspn.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strspn.c	28 Jan 2009 15:09:03 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -70,7 +71,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strstr.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strstr.c,v
retrieving revision 1.3
diff -u -p -r1.3 strstr.c
--- tests/strstr.c	23 May 2002 23:07:30 -0000	1.3
+++ tests/strstr.c	28 Jan 2009 15:09:03 -0000
@@ -50,6 +50,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -69,7 +70,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strtok.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strtok.c,v
retrieving revision 1.3
diff -u -p -r1.3 strtok.c
--- tests/strtok.c	23 May 2002 23:07:31 -0000	1.3
+++ tests/strtok.c	28 Jan 2009 15:09:03 -0000
@@ -55,6 +55,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -146,8 +147,11 @@ test( CYG_ADDRWORD data )
 
 } // test()
 
-int
-main(int argc, char *argv[])
+#if CYGINT_ISO_MAIN_STARTUP
+int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     CYG_TEST_INIT();
 
Index: tests/strxfrm1.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strxfrm1.c,v
retrieving revision 1.3
diff -u -p -r1.3 strxfrm1.c
--- tests/strxfrm1.c	23 May 2002 23:07:31 -0000	1.3
+++ tests/strxfrm1.c	28 Jan 2009 15:09:03 -0000
@@ -55,6 +55,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -98,7 +99,11 @@ static char *my_strcpy(char *s1, const c
 } // my_strcpy()
 
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];
Index: tests/strxfrm2.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/tests/strxfrm2.c,v
retrieving revision 1.3
diff -u -p -r1.3 strxfrm2.c
--- tests/strxfrm2.c	23 May 2002 23:07:31 -0000	1.3
+++ tests/strxfrm2.c	28 Jan 2009 15:09:03 -0000
@@ -55,6 +55,7 @@
 
 // INCLUDES
 
+#include <pkgconf/isoinfra.h>
 #include <string.h>
 #include <cyg/infra/testcase.h>
 
@@ -101,7 +102,11 @@ static char *my_strcpy(char *s1, const c
     return s1; 
 } // my_strcpy()
 
+#if CYGINT_ISO_MAIN_STARTUP
 int main( int argc, char *argv[] )
+#else
+void cyg_user_start(void)
+#endif
 {
     char x[300];
     char y[300];


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]