removed extern "C" for freertos includes

osal/FreeRTOS/BinSemaphUsingTask.h

@@ -4,10 +4,8 @@
 #include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <framework/tasks/SemaphoreIF.h>
 
-extern "C" {
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
-}
 
 /**
  * @brief 	Binary Semaphore implementation using the task notification value.

osal/FreeRTOS/BinarySemaphore.h

@@ -4,10 +4,8 @@
 #include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <framework/tasks/SemaphoreIF.h>
 
-extern "C" {
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
-}
 
 /**
  * @brief 	OS Tool to achieve synchronization of between tasks or between

osal/FreeRTOS/CountingSemaphore.cpp

@@ -2,9 +2,7 @@
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 #include <framework/osal/FreeRTOS/TaskManagement.h>
 
-extern "C" {
 #include <freertos/semphr.h>
-}
 
 // Make sure #define configUSE_COUNTING_SEMAPHORES 1 is set in
 // free FreeRTOSConfig.h file.

osal/FreeRTOS/MessageQueue.cpp

@@ -1,4 +1,4 @@
-#include "MessageQueue.h"
+#include <framework/osal/FreeRTOS/MessageQueue.h>
 
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 

osal/FreeRTOS/MessageQueue.h

@@ -6,11 +6,8 @@
 #include <framework/ipc/MessageQueueMessage.h>
 #include <framework/osal/FreeRTOS/TaskManagement.h>
 
-extern "C" {
 #include <freertos/FreeRTOS.h>
 #include <freertos/queue.h>
-}
-
 
 // TODO: this class assumes that MessageQueueId_t is the same size as void*
 // (the FreeRTOS handle type), compiler will catch this but it might be nice
@@ -164,11 +161,7 @@ public:
 	MessageQueueId_t getId() const;
 
 	/**
-<<<<<<< HEAD
-	 * \brief	This method is a simple setter for the default destination.
-=======
 	 * @brief	This method is a simple setter for the default destination.
->>>>>>> mueller_BinSempahInterface
 	 */
 	void setDefaultDestination(MessageQueueId_t defaultDestination);
 	/**

osal/FreeRTOS/Mutex.cpp

@@ -1,4 +1,4 @@
-#include "Mutex.h"
+#include <framework/osal/FreeRTOS/Mutex.h>
 
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 

osal/FreeRTOS/Mutex.h

@@ -3,11 +3,8 @@
 
 #include <framework/ipc/MutexIF.h>
 
-extern "C" {
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
-}
-
 
 /**
  * @brief OS component to implement MUTual EXclusion