Revert "hwc: add the prototypes to avoid build break"

This reverts commit 360af47b34a4fbcfb48be27fdae57654f22c91ef.

Change-Id: Iff209d517462a5929f251187a523bfbfdd2776fe

diff --git a/include/tdm.h b/include/tdm.h
index 8b74b0e55f293f8a1115e8e8e45f4eb85ec104ac..63edce4b7fa8f7b4ad95002e220310e373a4cfec 100644 (file)
--- a/include/tdm.h
+++ b/include/tdm.h
@@ -1016,9 +1016,6 @@ tdm_hwc_get_changed_composition_types(tdm_hwc *hwc, uint32_t *num_elements,
 tdm_error
 tdm_hwc_accept_validation(tdm_hwc *hwc);
 
-/* temporary prototype to avoid build break */
-tdm_error tdm_hwc_accept_changes(tdm_hwc *hwc);
-
 /**
  * @brief Commit changes for a hwc
  * @details After all change of a window object are applied, a user commit handler

diff --git a/include/tdm_types.h b/include/tdm_types.h
index 50fb4b8672e4f4b1b047601b4b549300b6eb8120..d9ab9848ce5d4e6f476090a3e8a816ef0c8014cc 100644 (file)
--- a/include/tdm_types.h
+++ b/include/tdm_types.h
@@ -222,15 +222,6 @@ typedef enum {
        TDM_HWC_WIN_CONSTRAINT_BUFFER_QUEUE = (1 << 0),
 } tdm_hwc_window_constraint;
 
-/* temporary prototype to avoid build break */
-#define TDM_CONSTRAINT_NONE 0
-#define TDM_CONSTRAINT_BUFFER_QUEUE  (1 << 0)
-#define TDM_COMPOSITION_NONE 0
-#define TDM_COMPOSITION_CLIENT 1
-#define TDM_COMPOSITION_DEVICE 3
-#define TDM_COMPOSITION_CURSOR 4
-#define TDM_COMPOSITION_VIDEO 5
-
 /**
  * @brief The tdm display object
  */

diff --git a/src/tdm_hwc.c b/src/tdm_hwc.c
index bd7428c438cb08671a7093be3249aa11c40ed3d1..fc9563c9693d635ef5a923de6764c77df3877daf 100644 (file)
--- a/src/tdm_hwc.c
+++ b/src/tdm_hwc.c
@@ -510,13 +510,6 @@ tdm_hwc_accept_validation(tdm_hwc *hwc)
        return ret;
 }
 
-/* temporary prototype to avoid build break */
-tdm_error
-tdm_hwc_accept_changes(tdm_hwc *hwc)
-{
-   return tdm_hwc_accept_validation(hwc);
-}
-
 EXTERN tdm_error
 tdm_hwc_commit(tdm_hwc *hwc, int sync, tdm_hwc_commit_handler func, void *user_data)
 {