Revert "Change position and sequence of header including"

Revert submission 317006

Reason for revert: for applying tizen_9.0's code

Reverted changes: /gerrit/q/submissionid:317006

Change-Id: I023e5568d635c1246cd73cd27054aa8b229c5886

diff --git a/include/hal-tbm-interface-1.h b/include/hal-tbm-interface-1.h
index b707e575f409c1dc0ba4a6b3ad013e1935f322fb..1b6294bdc622d38fac9c9541f4550adb8a78e6e8 100644 (file)
--- a/include/hal-tbm-interface-1.h
+++ b/include/hal-tbm-interface-1.h
@@ -33,12 +33,12 @@
 #ifndef __HAL_TBM_INTERFACE_1__
 #define __HAL_TBM_INTERFACE_1__
 
-#include <hal-tbm-types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include <hal-tbm-types.h>
+
 typedef struct _hal_tbm_backend_data hal_tbm_backend_data;
 
 typedef struct _hal_tbm_bufmgr_funcs hal_tbm_bufmgr_funcs;

diff --git a/include/hal-tbm.h b/include/hal-tbm.h
index d52a862bfb66287d9784d0d00b5fef5f2f2390fc..46302b2c3beb5a230c530f05cc2732348ed4b74a 100644 (file)
--- a/include/hal-tbm.h
+++ b/include/hal-tbm.h
@@ -33,12 +33,12 @@
 #ifndef __HAL_TBM__
 #define __HAL_TBM__
 
-#include <hal-tbm-interface.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include <hal-tbm-types.h>
+
 /**
  * @file hal-tbm.h
  * @brief This file contains the Tizen TBM HAL interface API, related structures and enumerations.

diff --git a/src/hal-api-tbm.c b/src/hal-api-tbm.c
index 006fbad58b2b3944a57439c59f47fee2c49ae779..48ba64f32d399cbe5c7d9a24a47fc72f15494325 100644 (file)
--- a/src/hal-api-tbm.c
+++ b/src/hal-api-tbm.c
@@ -37,6 +37,7 @@
 #include <hal-common.h>
 #include "common.h"
 #include "hal-tbm.h"
+#include "hal-tbm-interface.h"
 
 #if defined(__GNUC__) && __GNUC__ >= 4
 #define EXTERN __attribute__ ((visibility("default")))