[Piglit] [PATCH 04/29] util: Add ifdef quards around redefined macros
Pauli Nieminen
pauli.nieminen at linux.intel.com
Mon May 21 11:08:39 PDT 2012
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 at linux.intel.com>
---
tests/util/piglit-dispatch.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/util/piglit-dispatch.h b/tests/util/piglit-dispatch.h
index ef2687a..002b8c0 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
--
1.7.5.4
More information about the Piglit
mailing list