diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-09-23 06:52:33 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-09-23 06:59:59 +0200 |
| commit | 75a6584a43a9ab4170376d31fe4041bbaaa7f547 (patch) | |
| tree | f8e7d7dede0664a23e7c559125ca3196241e2335 /cpukit/score/src/percpuasm.c | |
| parent | libdl: Fix cache corruption bugs. (diff) | |
| download | rtems-75a6584a43a9ab4170376d31fe4041bbaaa7f547.tar.bz2 | |
score: Fix C/C++ compatibility issue
Only use CPU_Per_CPU_control if it contains at least one filed. In GNU
C empty structures have a size of zero. In C++ structures have a
non-zero size. In case CPU_PER_CPU_CONTROL_SIZE is defined to zero,
then this structure is not used anymore.
Close #2789.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/score/src/percpuasm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpukit/score/src/percpuasm.c b/cpukit/score/src/percpuasm.c index 15b49c72e1..53e6326abd 100644 --- a/cpukit/score/src/percpuasm.c +++ b/cpukit/score/src/percpuasm.c @@ -64,10 +64,12 @@ RTEMS_STATIC_ASSERT( ); #endif -RTEMS_STATIC_ASSERT( - sizeof( CPU_Per_CPU_control ) == CPU_PER_CPU_CONTROL_SIZE, - CPU_PER_CPU_CONTROL_SIZE -); +#if CPU_PER_CPU_CONTROL_SIZE > 0 + RTEMS_STATIC_ASSERT( + sizeof( CPU_Per_CPU_control ) == CPU_PER_CPU_CONTROL_SIZE, + CPU_PER_CPU_CONTROL_SIZE + ); +#endif #if defined( RTEMS_SMP ) RTEMS_STATIC_ASSERT( |