summaryrefslogtreecommitdiffstats
path: root/cpukit/score/include/rtems/score
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-09-23 06:52:33 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-09-23 06:57:03 +0200
commit9149c87ec724ed4e3f45762e771c12f81c3f5a33 (patch)
tree3687ac319c3bf27729dc56da77541a5194ffe708 /cpukit/score/include/rtems/score
parentarm/tms570: document BSP setup with included hardware initialization. (diff)
downloadrtems-9149c87ec724ed4e3f45762e771c12f81c3f5a33.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.
Diffstat (limited to '')
-rw-r--r--cpukit/score/include/rtems/score/percpu.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/score/include/rtems/score/percpu.h
index 8d47aaca4f..cb28cd98c4 100644
--- a/cpukit/score/include/rtems/score/percpu.h
+++ b/cpukit/score/include/rtems/score/percpu.h
@@ -260,10 +260,12 @@ typedef enum {
* This structure is used to hold per core state information.
*/
typedef struct Per_CPU_Control {
- /**
- * @brief CPU port specific control.
- */
- CPU_Per_CPU_control cpu_per_cpu;
+ #if CPU_PER_CPU_CONTROL_SIZE > 0
+ /**
+ * @brief CPU port specific control.
+ */
+ CPU_Per_CPU_control cpu_per_cpu;
+ #endif
#if (CPU_ALLOCATE_INTERRUPT_STACK == TRUE) || \
(CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)