Index: ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/infra/current/ChangeLog,v retrieving revision 1.50 diff -u -r1.50 ChangeLog --- ChangeLog 22 Jul 2005 09:20:44 -0000 1.50 +++ ChangeLog 30 Jul 2005 11:48:39 -0000 @@ -1,3 +1,10 @@ +2005-07-29 Andrew Lunn + + * include/cyg_ass.h: Fixed a function prototype so that + gcc4 does not give warnings. A const void makes no sense. + * src/*.cxx (cyg_check_func_ptr): match the implementation to the + prototype. + 2005-06-27 Andrew Lunn * include/cyg_type.h: Added CYGBLD_ATTRIB_USED so that we can Index: include/cyg_ass.h =================================================================== RCS file: /cvs/ecos/ecos/packages/infra/current/include/cyg_ass.h,v retrieving revision 1.11 diff -u -r1.11 cyg_ass.h --- include/cyg_ass.h 18 Jan 2003 04:18:26 -0000 1.11 +++ include/cyg_ass.h 30 Jul 2005 11:48:40 -0000 @@ -157,7 +157,7 @@ // regions. externC cyg_bool cyg_check_data_ptr(const void *ptr); -externC cyg_bool cyg_check_func_ptr(const void (*ptr)(void)); +externC cyg_bool cyg_check_func_ptr(void (*ptr)(void)); #ifdef CYGDBG_USE_ASSERTS @@ -169,7 +169,7 @@ # define CYG_CHECK_FUNC_PTR( _ptr_, _msg_ ) \ CYG_MACRO_START \ - if( !cyg_check_func_ptr((const void (*)(void))(_ptr_))) \ + if( !cyg_check_func_ptr((void (*)(void))(_ptr_))) \ CYG_ASSERT_DOCALL( _msg_ ); \ CYG_MACRO_END @@ -181,7 +181,7 @@ # define CYG_CHECK_FUNC_PTRC( _ptr_ ) \ CYG_MACRO_START \ - if ( !cyg_check_func_ptr((const void (*)(void))(_ptr_))) \ + if ( !cyg_check_func_ptr((void (*)(void))(_ptr_))) \ CYG_ASSERT_DOCALL("function pointer (" #_ptr_ ") is valid"); \ CYG_MACRO_END Index: src/buffer.cxx =================================================================== RCS file: /cvs/ecos/ecos/packages/infra/current/src/buffer.cxx,v retrieving revision 1.13 diff -u -r1.13 buffer.cxx --- src/buffer.cxx 18 Jan 2003 04:18:27 -0000 1.13 +++ src/buffer.cxx 30 Jul 2005 11:48:41 -0000 @@ -772,7 +772,7 @@ return true; } -externC cyg_bool cyg_check_func_ptr(const void (*ptr)(void)) +externC cyg_bool cyg_check_func_ptr(void (*ptr)(void)) { unsigned long p = (unsigned long)ptr; Index: src/fancy.cxx =================================================================== RCS file: /cvs/ecos/ecos/packages/infra/current/src/fancy.cxx,v retrieving revision 1.12 diff -u -r1.12 fancy.cxx --- src/fancy.cxx 18 Jan 2003 04:18:27 -0000 1.12 +++ src/fancy.cxx 30 Jul 2005 11:48:42 -0000 @@ -643,7 +643,7 @@ return true; } -externC cyg_bool cyg_check_func_ptr(const void (*ptr)(void)) +externC cyg_bool cyg_check_func_ptr(void (*ptr)(void)) { unsigned long p = (unsigned long)ptr; Index: src/null.cxx =================================================================== RCS file: /cvs/ecos/ecos/packages/infra/current/src/null.cxx,v retrieving revision 1.11 diff -u -r1.11 null.cxx --- src/null.cxx 18 Jan 2003 04:18:27 -0000 1.11 +++ src/null.cxx 30 Jul 2005 11:48:42 -0000 @@ -166,7 +166,7 @@ return true; } -externC cyg_bool cyg_check_func_ptr(const void (*ptr)(void)) +externC cyg_bool cyg_check_func_ptr(void (*ptr)(void)) { unsigned long p = (unsigned long)ptr;