diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-06-27 15:06:16 +0100 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-06-29 21:40:58 -0700 |
| commit | 79ef102c3adf7cae8982b05320109d0439e6587c (patch) | |
| tree | e555325113e4c499566a0458fc75a5ef931d29dc | |
| parent | f0ee98584c909b503691d72c01f76602d0a28ba2 (diff) | |
Guard use of backtrace() with HAVE_BACKTRACE
Guard the use of backtrace() with HAVE_BACKTRACE, since we already
have the autoconf machinery for setting that.
For the moment, assume dladdr() is available when backtrace() is
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 38d55f06cfbf4b05fee0aef8f97f90e835beaacb)
| -rw-r--r-- | glx/glapi_gentable.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/glx/glapi_gentable.c b/glx/glapi_gentable.c index a9ba3af56..b49ae20f4 100644 --- a/glx/glapi_gentable.c +++ b/glx/glapi_gentable.c @@ -31,7 +31,10 @@ #include <dix-config.h> #endif +#ifdef HAVE_BACKTRACE #include <execinfo.h> +#endif + #include <dlfcn.h> #include <stdlib.h> #include <stdio.h> @@ -46,6 +49,8 @@ static void __glapi_gentable_NoOp(void) { const char *fstr = "Unknown"; + +#ifdef HAVE_BACKTRACE void *frames[2]; if(backtrace(frames, 2) == 2) { @@ -54,6 +59,7 @@ __glapi_gentable_NoOp(void) { if(info.dli_sname) fstr = info.dli_sname; } +#endif LogMessage(X_ERROR, "GLX: Call to unimplemented API: %s\n", fstr); } |