From 68dd0b52e13c844d662192654fb10cb993257a59 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 22 Jun 2015 09:36:08 +0200 Subject: Replace 'pointer' type with 'void *' This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: Keith Packard Reviewed-by: Eric Anholt Rebased against NX: Mike Gabriel --- nx-X11/programs/Xserver/include/pixmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/include/pixmap.h') diff --git a/nx-X11/programs/Xserver/include/pixmap.h b/nx-X11/programs/Xserver/include/pixmap.h index 6cea329ec..3c9f91a00 100644 --- a/nx-X11/programs/Xserver/include/pixmap.h +++ b/nx-X11/programs/Xserver/include/pixmap.h @@ -92,7 +92,7 @@ extern PixmapPtr GetScratchPixmapHeader( int /*depth*/, int /*bitsPerPixel*/, int /*devKind*/, - pointer /*pPixData*/); + void * /*pPixData*/); extern void FreeScratchPixmapHeader( PixmapPtr /*pPixmap*/); -- cgit v1.2.3 From 6144b615dd7ae2acd786aaa08f66c9743870b709 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 16:32:57 +0200 Subject: VCS info lines: Remove ancient X.org / XFree86 VCS info line from code files. This has already been started while replacing copyright info in file headers and has now been completed with this commit. --- nx-X11/programs/Xserver/include/pixmap.h | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-X11/programs/Xserver/include/pixmap.h') diff --git a/nx-X11/programs/Xserver/include/pixmap.h b/nx-X11/programs/Xserver/include/pixmap.h index 3c9f91a00..22e1ce7bd 100644 --- a/nx-X11/programs/Xserver/include/pixmap.h +++ b/nx-X11/programs/Xserver/include/pixmap.h @@ -1,4 +1,3 @@ -/* $Xorg: pixmap.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -- cgit v1.2.3 From 4ad88de861f6a513d4d6ae4b4609f7ced1001a6b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 19 Apr 2017 13:08:26 +0200 Subject: Clearing comments from $XFree86$ (et al.) header lines. --- nx-X11/programs/Xserver/include/pixmap.h | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-X11/programs/Xserver/include/pixmap.h') diff --git a/nx-X11/programs/Xserver/include/pixmap.h b/nx-X11/programs/Xserver/include/pixmap.h index 22e1ce7bd..7d893d57c 100644 --- a/nx-X11/programs/Xserver/include/pixmap.h +++ b/nx-X11/programs/Xserver/include/pixmap.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef PIXMAP_H #define PIXMAP_H -- cgit v1.2.3