diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:00:15 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-12 18:00:15 -0700 |
| commit | 9ca9d19206114788da85c81a5aba2525baef80cb (patch) | |
| tree | c66ba3dbd195708d0150e6418a5d230a617ea0d1 /xdpyinfo.c | |
| parent | 26b3ee9b9fd5a58ef7812ecabebd78bd10d57878 (diff) | |
Use Xxf86dga.h & xf86dgaproto.h if present, to avoid warnings from old headers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'xdpyinfo.c')
| -rw-r--r-- | xdpyinfo.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -51,7 +51,8 @@ in this Software without prior written authorization from The Open Group. # define XF86VIDMODE # endif -# if HAVE_X11_EXTENSIONS_XF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGASTR_H +# if (HAVE_X11_EXTENSIONS_XXF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGAPROTO_H) \ + || (HAVE_X11_EXTENSIONS_XF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGASTR_H) # define XFreeXDGA # endif @@ -112,8 +113,13 @@ in this Software without prior written authorization from The Open Group. # endif #endif #ifdef XFreeXDGA -#include <X11/extensions/xf86dga.h> -#include <X11/extensions/xf86dgastr.h> +# if HAVE_X11_EXTENSIONS_XXF86DGA_H && HAVE_X11_EXTENSIONS_XF86DGAPROTO_H +# include <X11/extensions/Xxf86dga.h> +# include <X11/extensions/xf86dgaproto.h> +# else +# include <X11/extensions/xf86dga.h> +# include <X11/extensions/xf86dgastr.h> +# endif #endif #ifdef XF86MISC #include <X11/extensions/xf86misc.h> |