diff options
| author | Matt Turner <[email protected]> | 2013-04-22 11:50:29 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-04-30 14:03:32 -0700 |
| commit | 242809942fd54b23a61fffdd0b1ba443f11c2bf6 (patch) | |
| tree | 18ba980996e13866f19e8cf9189fb1de0b6f263a | |
| parent | 657cfe62521f05dab744824e9d72e0a753fd9096 (diff) | |
build: Rename PIPE_LOADER_HAVE_XCB to HAVE_PIPE_LOADER_XCB.
For consistency, since we already have HAVE_PIPE_LOADER_{SW,DRM}.
Tested-by: Tom Stellard <[email protected]>
Tested-by: Aaron Watry <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6cf7b2d6137..7cad3cba9cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1926,7 +1926,7 @@ if test "x$enable_gallium_loader" = xyes; then PKG_CHECK_MODULES([GALLIUM_PIPE_LOADER_XCB], [xcb xcb-dri2], pipe_loader_have_xcb=yes, pipe_loader_have_xcb=no) if test "x$pipe_loader_have_xcb" = xyes; then - GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DPIPE_LOADER_HAVE_XCB" + GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XCB" GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS $GALLIUM_PIPE_LOADER_XCB_LIBS $LIBDRM_LIBS" fi fi diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c index 6dedc413989..339d7bf10b6 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c @@ -35,7 +35,7 @@ #include <libudev.h> #include <xf86drm.h> -#ifdef PIPE_LOADER_HAVE_XCB +#ifdef HAVE_PIPE_LOADER_XCB #include <xcb/dri2.h> @@ -133,7 +133,7 @@ static struct pipe_loader_ops pipe_loader_drm_ops; static void pipe_loader_drm_x_auth(int fd) { -#if PIPE_LOADER_HAVE_XCB +#if HAVE_PIPE_LOADER_XCB /* Try authenticate with the X server to give us access to devices that X * is running on. */ xcb_connection_t *xcb_conn; |