diff options
| author | Austin Yuan <shengquan.yuan@intel.com> | 2009-11-20 16:07:03 +0800 |
|---|---|---|
| committer | Austin Yuan <shengquan.yuan@intel.com> | 2009-11-20 16:07:03 +0800 |
| commit | 1ead54598b3562dec0bb17e9a35284a274c47056 (patch) | |
| tree | e8f54736c22146c3b2c9caae1f5912548d95875c /i965_drv_video/intel_driver.h | |
| parent | 7e62098ac9851fde3b86d8c73f742c0d7685e056 (diff) | |
| parent | 2135de7e7c18e3668c2a8f9fc15db6e671fab8df (diff) | |
| download | libva-1ead54598b3562dec0bb17e9a35284a274c47056.tar.gz | |
Merge branch 'master' of git+ssh://AustinYuan@git.freedesktop.org/git/libva20091120_Alpha3
Diffstat (limited to 'i965_drv_video/intel_driver.h')
| -rw-r--r-- | i965_drv_video/intel_driver.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/i965_drv_video/intel_driver.h b/i965_drv_video/intel_driver.h index f768703..84df0aa 100644 --- a/i965_drv_video/intel_driver.h +++ b/i965_drv_video/intel_driver.h @@ -43,6 +43,7 @@ struct intel_batchbuffer; #define ALIGN(i, n) (((i) + (n) - 1) & ~((n) - 1)) #define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define SET_BLOCKED_SIGSET() do { \ sigset_t bl_mask; \ |