diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
| commit | 1dad092caf01d733990648e6df64cbf964df5143 (patch) | |
| tree | 39de0e643e76754a3e23ca9dd0350b8ba4f76250 /nx-X11/programs/Xserver/include/gcstruct.h | |
| parent | 6d70b9e3c47f27a166f4aacb522c5c1e49092dd9 (diff) | |
| parent | 2b9025f797ee322e21077e100c2ee27c2e7fa0e0 (diff) | |
| download | nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.gz nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.bz2 nx-libs-1dad092caf01d733990648e6df64cbf964df5143.zip | |
Merge branch '3.6.x'
Diffstat (limited to 'nx-X11/programs/Xserver/include/gcstruct.h')
| -rw-r--r-- | nx-X11/programs/Xserver/include/gcstruct.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/include/gcstruct.h b/nx-X11/programs/Xserver/include/gcstruct.h index c2226ba17..9a8169cab 100644 --- a/nx-X11/programs/Xserver/include/gcstruct.h +++ b/nx-X11/programs/Xserver/include/gcstruct.h @@ -1,4 +1,3 @@ -/* $Xorg: gcstruct.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,7 +46,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ #ifndef GCSTRUCT_H #define GCSTRUCT_H @@ -58,7 +56,7 @@ SOFTWARE. #include "region.h" #include "pixmap.h" #include "screenint.h" -#include <X11/Xprotostr.h> +#include <nx-X11/Xprotostr.h> /* * functions which modify the state of the GC @@ -85,7 +83,7 @@ typedef struct _GCFuncs { void (* ChangeClip)( GCPtr /*pGC*/, int /*type*/, - pointer /*pvalue*/, + void * /*pvalue*/, int /*nrects*/); void (* DestroyClip)( @@ -244,7 +242,7 @@ typedef struct _GCOps { int /*y*/, unsigned int /*nglyph*/, CharInfoPtr * /*ppci*/, - pointer /*pglyphBase*/); + void * /*pglyphBase*/); void (* PolyGlyphBlt)( DrawablePtr /*pDrawable*/, @@ -253,7 +251,7 @@ typedef struct _GCOps { int /*y*/, unsigned int /*nglyph*/, CharInfoPtr * /*ppci*/, - pointer /*pglyphBase*/); + void * /*pglyphBase*/); void (* PushPixels)( GCPtr /*pGC*/, @@ -309,7 +307,7 @@ typedef struct _GC { struct _Font *font; DDXPointRec clipOrg; DDXPointRec lastWinOrg; /* position of window last validated */ - pointer clientClip; + void * clientClip; unsigned long stateChanges; /* masked with GC_<kind> */ unsigned long serialNumber; GCFuncs *funcs; |