From 1cb75cc4c2683b9287f3e91e46b5185fce65780a Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 23 Jul 2013 15:32:50 +0200
Subject: score: Merge wkspace API into one file

---
 cpukit/score/include/rtems/score/wkspace.h | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'cpukit/score/include')

diff --git a/cpukit/score/include/rtems/score/wkspace.h b/cpukit/score/include/rtems/score/wkspace.h
index 91059f734f..7adf9dff07 100644
--- a/cpukit/score/include/rtems/score/wkspace.h
+++ b/cpukit/score/include/rtems/score/wkspace.h
@@ -20,6 +20,13 @@
 #ifndef _RTEMS_SCORE_WKSPACE_H
 #define _RTEMS_SCORE_WKSPACE_H
 
+#include <rtems/score/heap.h>
+#include <rtems/score/interr.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  @defgroup ScoreWorkspace Workspace Handler
  *
@@ -30,13 +37,6 @@
  */
 /**@{*/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/heap.h>
-#include <rtems/score/interr.h>
-
 /**
  *  @brief Executive workspace control.
  *
@@ -117,15 +117,11 @@ char *_Workspace_String_duplicate(
   size_t len
 );
 
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/wkspace.inl>
-#endif
+/**@}*/
 
 #ifdef __cplusplus
 }
 #endif
 
-/**@}*/
-
 #endif
 /* end of include file */
-- 
cgit v1.2.3