diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 18:18:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 18:18:08 +0000 |
| commit | e445df175688f07d599649591c990d432375c67e (patch) | |
| tree | fc2295b9683852cab5394a4f187ca0001c987e4a /X11/extensions/xfixesproto.h | |
| parent | cbeb9ffa0c58e5e9b012ea3eb17dbf192659627f (diff) | |
| parent | cd50a4bbac9375d3cd460bbdf88395f802609daf (diff) | |
| download | vcxsrv-e445df175688f07d599649591c990d432375c67e.tar.gz vcxsrv-e445df175688f07d599649591c990d432375c67e.tar.bz2 vcxsrv-e445df175688f07d599649591c990d432375c67e.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'X11/extensions/xfixesproto.h')
| -rw-r--r-- | X11/extensions/xfixesproto.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/X11/extensions/xfixesproto.h b/X11/extensions/xfixesproto.h index d3899810a..545e325a9 100644 --- a/X11/extensions/xfixesproto.h +++ b/X11/extensions/xfixesproto.h @@ -1,7 +1,7 @@ /* * $XFree86: xc/include/extensions/xfixesproto.h,v 1.1 2002/11/30 06:21:43 keithp Exp $ * - * Copyright © 2006 Sun Microsystems + * Copyright © 2006 Sun Microsystems * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. * - * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. + * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -47,9 +47,7 @@ #include <X11/Xmd.h> #include <X11/extensions/xfixeswire.h> -#define _SHAPE_SERVER_ -#include <X11/extensions/shape.h> -#undef _SHAPE_SERVER_ +#include <X11/extensions/shapeconst.h> #define Window CARD32 #define Drawable CARD32 |