Module Name: src
Committed By: mrg
Date: Sat Aug 14 08:51:32 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/include/xextproto: Makefile
Log Message:
re-enable shapestr.h and syncstr.h, from xextproto 7.1.2.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/include/xextproto/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.112 src/distrib/sets/lists/xcomp/mi:1.113
--- src/distrib/sets/lists/xcomp/mi:1.112 Sun Jul 18 10:58:06 2010
+++ src/distrib/sets/lists/xcomp/mi Sat Aug 14 08:51:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.112 2010/07/18 10:58:06 mrg Exp $
+# $NetBSD: mi,v 1.113 2010/08/14 08:51:32 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5641,14 +5641,14 @@
./usr/X11R7/include/X11/extensions/shape.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shapeconst.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shapeproto.h -unknown- xorg
-./usr/X11R7/include/X11/extensions/shapestr.h -unknown- obsolete
+./usr/X11R7/include/X11/extensions/shapestr.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shm.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shmproto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shmstr.h -unknown- xorg
./usr/X11R7/include/X11/extensions/sync.h -unknown- xorg
./usr/X11R7/include/X11/extensions/syncconst.h -unknown- xorg
./usr/X11R7/include/X11/extensions/syncproto.h -unknown- xorg
-./usr/X11R7/include/X11/extensions/syncstr.h -unknown- obsolete
+./usr/X11R7/include/X11/extensions/syncstr.h -unknown- xorg
./usr/X11R7/include/X11/extensions/vldXvMC.h -unknown- xorg
./usr/X11R7/include/X11/extensions/xcmiscproto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/xcmiscstr.h -unknown- xorg
Index: src/external/mit/xorg/include/xextproto/Makefile
diff -u src/external/mit/xorg/include/xextproto/Makefile:1.4 src/external/mit/xorg/include/xextproto/Makefile:1.5
--- src/external/mit/xorg/include/xextproto/Makefile:1.4 Sat May 22 05:44:08 2010
+++ src/external/mit/xorg/include/xextproto/Makefile Sat Aug 14 08:51:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/22 05:44:08 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/08/14 08:51:32 mrg Exp $
.include <bsd.own.mk>
@@ -35,7 +35,7 @@
xtestext1proto.h \
xtestproto.h
# XXX XXX XXX xorg-server 1.7 won't need this
-INCS+= shmstr.h
+INCS+= shapestr.h shmstr.h syncstr.h
#
INCSDIR=${X11INCDIR}/X11/extensions
