diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-02-21 11:54:37 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-02-21 11:54:37 +0000 |
| commit | 4be93c07eced9088b2b047d8865c0b17ede231a2 (patch) | |
| tree | 8400169b5437010425007f47f05820d751dbd7ee /cpukit | |
| parent | 2011-02-21 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-4be93c07eced9088b2b047d8865c0b17ede231a2.tar.bz2 | |
2011-02-21 Sebastian Huber <sebastian.huber@embedded-brains.de>
* sapi/include/confdefs.h,
score/include/rtems/score/schedulerpriority.h: C++ compatibility.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 4 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/schedulerpriority.h | 22 |
3 files changed, 18 insertions, 13 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index e20dbd43c4..7bbc8603cd 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2011-02-21 Sebastian Huber <sebastian.huber@embedded-brains.de> + * sapi/include/confdefs.h, + score/include/rtems/score/schedulerpriority.h: C++ compatibility. + +2011-02-21 Sebastian Huber <sebastian.huber@embedded-brains.de> + * libnetworking/lib/ftpfs.c: Workaround for some firewalls. 2011-02-18 Joel Sherrill <joel.sherrill@oarcorp.com> diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index c48228c67c..03b99d3d57 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -603,8 +603,8 @@ rtems_fs_init_functions_t rtems_fs_init_helper = */ #ifdef CONFIGURE_INIT Scheduler_Control _Scheduler = { - .information = NULL, - .Operations = SCHEDULER_ENTRY_POINTS + NULL, + SCHEDULER_ENTRY_POINTS }; #endif diff --git a/cpukit/score/include/rtems/score/schedulerpriority.h b/cpukit/score/include/rtems/score/schedulerpriority.h index 767e8425d5..a31d10a727 100644 --- a/cpukit/score/include/rtems/score/schedulerpriority.h +++ b/cpukit/score/include/rtems/score/schedulerpriority.h @@ -38,17 +38,17 @@ extern "C" { */ #define SCHEDULER_PRIORITY_ENTRY_POINTS \ { \ - .initialize = _Scheduler_priority_Initialize, \ - .schedule = _Scheduler_priority_Schedule, \ - .yield = _Scheduler_priority_Yield, \ - .block = _Scheduler_priority_Block, \ - .unblock = _Scheduler_priority_Unblock, \ - .allocate = _Scheduler_priority_Allocate, \ - .free = _Scheduler_priority_Free, \ - .update = _Scheduler_priority_Update, \ - .enqueue = _Scheduler_priority_Enqueue, \ - .enqueue_first = _Scheduler_priority_Enqueue_first, \ - .extract = _Scheduler_priority_Extract \ + _Scheduler_priority_Initialize, \ + _Scheduler_priority_Schedule, \ + _Scheduler_priority_Yield, \ + _Scheduler_priority_Block, \ + _Scheduler_priority_Unblock, \ + _Scheduler_priority_Allocate, \ + _Scheduler_priority_Free, \ + _Scheduler_priority_Update, \ + _Scheduler_priority_Enqueue, \ + _Scheduler_priority_Enqueue_first, \ + _Scheduler_priority_Extract \ } /** |