plugin-api: Relocate header inclusion part

When the extern C is applied, below header file occurs build error
while building cplusplus package.
When applying extern C, it causes a type error from glib header.
There is a possibility of type conflict depending on the header file,
and there is no need to inclusion part be located under "extern C".

Change-Id: I7782da2f5d130baf6c86285e2347ccd9d0bb94e7
Signed-off-by: Yunhee Seo <yuni.seo@samsung.com>

diff --git a/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-battery.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-battery.h
index 3565804b960975ba33d789a0306cbd2cecd716f8..28a9a448c3644c909d8f359c903d28535db3ec1c 100644 (file)
--- a/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-battery.h
+++ b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-battery.h
@@ -25,13 +25,13 @@
 #ifndef __SYSCOMMON_PLUGIN_DEVICED_BATTERY_H__
 #define __SYSCOMMON_PLUGIN_DEVICED_BATTERY_H__
 
+#include <stdbool.h>
+#include <system/syscommon-plugin-deviced-battery-interface.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <system/syscommon-plugin-deviced-battery-interface.h>
-
 /**
  * @brief Get the backend data of deviced-battery module
  * @return @c 0 on success, otherwise a negative error value

diff --git a/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display-interface.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display-interface.h
index 25c7581b467cb588073c0875af5d5f3fbacb31d8..caf54142a7b047a152e34e10ac7a3376499a2fd1 100644 (file)
--- a/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display-interface.h
+++ b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display-interface.h
@@ -25,13 +25,13 @@
 #ifndef __SYSCOMMON_PLUGIN_DEVICED_DISPLAY_INTERFACE_H__
 #define __SYSCOMMON_PLUGIN_DEVICED_DISPLAY_INTERFACE_H__
 
+#include <stdbool.h>
+#include <glib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <glib.h>
-
 #define DEVICED_DISPLAY_ATTR_INT_MAX_BRIGHTNESS                        (1ULL << 0)
 #define DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE                 (1ULL << 1)
 #define DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE              (1ULL << 2)

diff --git a/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display.h
index b49a5bdd2134e58d6753dfec9fee64c0417cd8cc..a999c9563fdee68739f11eb0e984d5721ffd5495 100644 (file)
--- a/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display.h
+++ b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display.h
@@ -25,13 +25,13 @@
 #ifndef __SYSCOMMON_PLUGIN_DEVICED_DISPLAY_H__
 #define __SYSCOMMON_PLUGIN_DEVICED_DISPLAY_H__
 
+#include <system/syscommon-plugin-deviced-common-interface.h>
+#include <system/syscommon-plugin-deviced-display-interface.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <system/syscommon-plugin-deviced-common-interface.h>
-#include <system/syscommon-plugin-deviced-display-interface.h>
-
 /**
  * @brief Get the backend data of deviced-display module
  * @return @c 0 on success, otherwise a negative error value