From ece175945ccdd4f90a86fb68fd374258064cf9bd Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 28 Nov 2011 17:51:47 +0000 Subject: [PATCH] 2011-11-28 Joel Sherrill PR 1941/cpukit * libmisc/monitor/mon-server.c, score/include/rtems/system.h: Remove use of RTEMS_offset() in favor of standard offsetof(). This was undocumented and there was only one internal use. Change noted in 4.11 release notes. --- cpukit/ChangeLog | 8 ++++++++ cpukit/libmisc/monitor/mon-server.c | 2 +- cpukit/score/include/rtems/system.h | 6 ------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f79ef4fc0b..e7486afe4f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2011-11-28 Joel Sherrill + + PR 1941/cpukit + * libmisc/monitor/mon-server.c, score/include/rtems/system.h: Remove + use of RTEMS_offset() in favor of standard offsetof(). This was + undocumented and there was only one internal use. Change noted in + 4.11 release notes. + 2011-11-28 Werner Almesberger PR 1961/cpukit diff --git a/cpukit/libmisc/monitor/mon-server.c b/cpukit/libmisc/monitor/mon-server.c index 03bc1932b2..c7408bbb1a 100644 --- a/cpukit/libmisc/monitor/mon-server.c +++ b/cpukit/libmisc/monitor/mon-server.c @@ -160,7 +160,7 @@ rtems_monitor_server_task( response.result0 = next_id; response.result1 = size; -#define SERVER_OVERHEAD (RTEMS_offsetof(rtems_monitor_server_response_t, \ +#define SERVER_OVERHEAD (offsetof(rtems_monitor_server_response_t, \ payload)) status = rtems_message_queue_send(request.return_id, diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h index 7ca6c33a8b..3e2a717b5b 100644 --- a/cpukit/score/include/rtems/system.h +++ b/cpukit/score/include/rtems/system.h @@ -33,12 +33,6 @@ extern "C" { int POSIX_NOT_IMPLEMENTED( void ); #endif -/** - * This macro is used to obtain the offset of a field in a structure. - */ -#define RTEMS_offsetof(type, field) \ - ((uintptr_t) &(((type *) 0)->field)) - /** * The following is the extern for the RTEMS version string. *