fdo-mirrors/xorg-xorgproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xorgproto.git synced 2025-12-20 04:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change xf86dga.h to only conditionally include server's header file.

Browse source 
The recent re-addition of the xf86dga.h file introduced an
incompatibility with a recent, but unreleased version of libXxf86dga
which also wanted to install a file of the same name. Instead, we
allow the proto package to own this file, and include the library's
version (now to be named Xxf86dga.h) unless we're building an old
server (indicated by _XF86DGA_SERVER_).
This commit is contained in:
Carl Worth 2009-09-16 17:03:30 -07:00
parent 047a1ebbbc
commit db4cb300de
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1,5 +1,5 @@
AC_PREREQ([2.57])
AC_INIT([XF86DGAProto], [2.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_INIT([XF86DGAProto], [2.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG

10
xf86dga.h
View file

@ -1,3 +1,13 @@
#ifdef _XF86DGA_SERVER_
#warning "xf86dga.h is obsolete and may be removed in the future."
#warning "include <X11/extensions/xf86dgaconst.h> instead."
#include <X11/extensions/xf86dgaconst.h>
#else
#warning "xf86dga.h is obsolete and may be removed in the future."
#warning "include <X11/extensions/Xxf86dga.h> instead."
#include <X11/extensions/Xxf86dga.h>
#endif