summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPauli Nieminen <pauli.nieminen@linux.intel.com>2012-04-27 14:44:57 +0300
committerPauli Nieminen <pauli.nieminen@linux.intel.com>2012-05-21 17:28:59 +0300
commit1766888ae85b8d01a75de06addf51aae9526c8ce (patch)
tree070259d930d49930fc969bc5ad2c4b9f8ebdb7bb
parentc617b35814c9f01ac004d0e0ba8e6e87b83d9172 (diff)
util: Add ifdef quards around redefined macros
APIENTRY and GLAPIENTRY are defined in gl or egl headers. To avoid compiler warning guard the defines with ifdefs. Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
-rw-r--r--tests/util/piglit-dispatch.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/util/piglit-dispatch.h b/tests/util/piglit-dispatch.h
index ef2687a8..002b8c05 100644
--- a/tests/util/piglit-dispatch.h
+++ b/tests/util/piglit-dispatch.h
@@ -63,8 +63,12 @@ extern "C" {
#ifndef _WIN32
/* APIENTRY and GLAPIENTRY are not used on Linux or Mac. */
+#ifndef APIENTRY
#define APIENTRY
+#endif
+#ifndef GLAPIENTRY
#define GLAPIENTRY
+#endif
#else