From b01798ea13327ea9048bdbffb4b98b172b8bbe3f Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 2 Mar 2005 07:44:53 +0000 Subject: [PATCH] Fix comment to clarify that libpixman regards the xserver repository as its canonical upstream for some files. --- pixman/ChangeLog | 4 ++++ pixman/src/pixman-xserver-compat.h | 21 +++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pixman/ChangeLog b/pixman/ChangeLog index 221f1cb4c..8cccd7895 100644 --- a/pixman/ChangeLog +++ b/pixman/ChangeLog @@ -1,5 +1,9 @@ 2005-03-02 Carl Worth + * 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, diff --git a/pixman/src/pixman-xserver-compat.h b/pixman/src/pixman-xserver-compat.h index 11bdea005..9b327758b 100644 --- a/pixman/src/pixman-xserver-compat.h +++ b/pixman/src/pixman-xserver-compat.h @@ -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. */