[cairo-commit] libpixman/src pixman-xserver-compat.h,1.1,1.2

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv5111/src

Modified Files:
	pixman-xserver-compat.h 
Log Message:

        * src/pixman-xserver-compat.h: Fix comment to clarify that
        libpixman regards the xserver repository as its canonical upstream
        for some files.


Index: pixman-xserver-compat.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/pixman-xserver-compat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pixman-xserver-compat.h	21 Jan 2005 18:52:56 -0000	1.1
+++ pixman-xserver-compat.h	2 Mar 2005 15:44:53 -0000	1.2
@@ -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. */