fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-17 20:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix comment to clarify that libpixman regards the xserver repository as its canonical upstream for some files.

Browse source
This commit is contained in:
Carl Worth 2005-03-02 07:44:53 +00:00
parent 6d50e485fa
commit b01798ea13
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pixman/ChangeLog
View file

@ -1,5 +1,9 @@
2005-03-02 Carl Worth <cworth@cworth.org>
* src/pixman-xserver-compat.h: Fix comment to clarify that
libpixman regards the xserver repository as its canonical upstream
for some files.
* src/ic.c, src/icblt.c, src/icbltone.c, src/iccolor.c,
src/iccompose.c, src/icformat.c, src/icimage.c, src/icimage.h,
src/icint.h, src/icpixels.c, src/icrect.c, src/icrop.h,

21
pixman/src/pixman-xserver-compat.h
View file

@ -23,18 +23,23 @@
* Author: Carl Worth, Red Hat, Inc.
*/
#ifndef _PIXMAN_XORG_COMPAT_H_
#define _PIXMAN_XORG_COMPAT_H_
#ifndef _PIXMAN_XSERVER_COMPAT_H_
#define _PIXMAN_XSERVER_COMPAT_H_
/* This is a compatibility header file, designed to make it easier to
* copy files directly from the xorg server into the implementation of
* libpixman.
* synchronize files between libpixman and the xserver repository.
*
* The intended usage is that when copying files from the server, the
* only change necessary should be to replace the block of include
* directives with:
* Of course, long-term we would instead like to have the X server
* depend on libpixman to eliminate the code duplication. But for now,
* we at least make it easy to share files.
*
* #include "pixman-xorg-compat.h"
* The libpixman code base regards the xserver repository as canonical
* for any shared files, so changes should be pushed up there. Then,
* to merge changes back down into libpixman, the process should be to
* simply copy the file and to replace the block of include directives
* with:
*
* #include "pixman-xserver-compat.h"
*/
/* First, include the primary internal header file for libpixman. */