diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:15:00 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:15:00 +0000 |
| commit | 80f3bc0df0118d01369f85c1e28fbf0f9d42f4fc (patch) | |
| tree | d380f8dd7791f5a2e602a013a9e707ced757f5b2 /src/xcursorint.h | |
| parent | 5b6ea4938668fe060e591b2ef273183d0e3aea6f (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
Diffstat (limited to 'src/xcursorint.h')
| -rw-r--r-- | src/xcursorint.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/xcursorint.h b/src/xcursorint.h index 97407fe..9e426c9 100644 --- a/src/xcursorint.h +++ b/src/xcursorint.h @@ -1,7 +1,6 @@ /* - * $XFree86: xc/lib/Xcursor/xcursorint.h,v 1.3 2002/11/23 02:34:45 keithp Exp $ * - * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. + * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,10 +24,20 @@ #ifndef _XCURSORINT_H_ #define _XCURSORINT_H_ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <X11/Xlib.h> #include <X11/cursorfont.h> #include <X11/extensions/Xrender.h> + +#ifdef HAVE_XFIXES +#include <X11/extensions/Xfixes.h> +#endif + #include "Xcursor.h" +#include "config.h" typedef struct _XcursorFontInfo { struct _XcursorFontInfo *next; |