i965: Delete our copy of likely/unlikely macros.

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

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index 8b1aa3e5e0cddcf23c1b947cabb34dafefc745b4..58a6e861aa19ad76840fe029252a8d870820db31 100644 (file)
--- 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;