summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-03-22 07:48:05 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-03-22 08:39:07 +0100
commit2c65588862b2ea77563dbc75902943f0d26e30d6 (patch)
tree810aa7b349cc9e7610f3303d91a5cb1da5d93761 /cpukit
parentmpci: Update due to thread queue API changes (diff)
downloadrtems-2c65588862b2ea77563dbc75902943f0d26e30d6.tar.bz2
config: Fix re-definition warning
Diffstat (limited to 'cpukit')
-rwxr-xr-xcpukit/include/rtems/confdefs.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index 9c836919c5..91839ff971 100755
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -1830,15 +1830,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#define CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK 0
#endif
-/**
- * This defines the timers required for the shared memory driver in
- * a multiprocessing configuration.
- */
-#ifndef _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER
- #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0
-#endif
-
-
#if defined(RTEMS_MULTIPROCESSING)
/*
* Default Multiprocessing Configuration Table. The defaults are
@@ -1896,15 +1887,13 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 1
#endif /* CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE */
-
#else
-
- #define CONFIGURE_MULTIPROCESSING_TABLE NULL
-
+ #define CONFIGURE_MULTIPROCESSING_TABLE NULL
+ #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0
#define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
-
#endif /* CONFIGURE_MP_APPLICATION */
#else
+ #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0
#define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
#endif /* RTEMS_MULTIPROCESSING */
/**@}*/ /* end of Multiprocessing Configuration */