[Mesa-dev] [PATCH 27/29] i965: Delete our copy of likely/unlikely macros.

[Kenneth Graunke]

brw_context.h includes imports.h which includes compiler.h which already
defines these.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 src/mesa/drivers/dri/i965/intel_context.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index 8b1aa3e..58a6e86 100644
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -60,16 +60,6 @@ struct intel_region;
 #define INTEL_WRITE_FULL  0x2
 #define INTEL_READ        0x4
 
-#ifndef likely
-#ifdef __GNUC__
-#define likely(expr) (__builtin_expect(expr, 1))
-#define unlikely(expr) (__builtin_expect(expr, 0))
-#else
-#define likely(expr) (expr)
-#define unlikely(expr) (expr)
-#endif
-#endif
-
 struct intel_sync_object {
    struct gl_sync_object Base;
 
-- 
1.8.3.4