Merge "Additional merges from cdm master"

2015-10-07 20:42:38 +00:00
parent ad3908e731 0fe3f79cc3
commit 72e4a10a8b
10 changed files with 25 additions and 14 deletions
--- a/libwvdrmengine/cdm/include/timer.h
+++ b/libwvdrmengine/cdm/include/timer.h
@@ -2,8 +2,8 @@
 //
 // Timer - Platform independent interface for a Timer class
 //
-#ifndef CDM_BASE_CORE_TIMER_H_
-#define CDM_BASE_CORE_TIMER_H_
+#ifndef CDM_BASE_TIMER_H_
+#define CDM_BASE_TIMER_H_

 #include "wv_cdm_types.h"

@@ -48,4 +48,4 @@ class Timer {

 }  // namespace wvcdm

-#endif  // CDM_BASE_CORE_TIMER_H_
+#endif  // CDM_BASE_TIMER_H_