Rename 'round' variable to avoid name conflict with built-in.

MythTV · Dec 20, 2012 · 6bfa78b · 6bfa78b
1 parent 3194b9f
commit 6bfa78b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/util-opengl.cpp b/mythtv/libs/libmythtv/util-opengl.cpp
@@ -100,7 +100,7 @@ static inline void mmx_pack_easy(uint8_t *dest, uint8_t *y)
 }
 
 static mmx_t mmx_0s = {0x0000000000000000LL};
-static mmx_t round  = {0x0002000200020002LL};
+static mmx_t mmx_round  = {0x0002000200020002LL};
 
 static inline void mmx_interp_start(uint8_t *left, uint8_t *right)
 {
@@ -110,7 +110,7 @@ static inline void mmx_interp_start(uint8_t *left, uint8_t *right)
     movq_r2r  (mm5, mm4);
     paddw_r2r (mm4, mm4);
     paddw_r2r (mm5, mm4);
-    paddw_m2r (round, mm4);
+    paddw_m2r (mmx_round, mm4);
 
     movd_m2r  (*right, mm5);
     punpcklbw_m2r (mmx_0s, mm5);