diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-19 18:10:46 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-19 18:10:46 -0500 |
| commit | 2d17f47cc7d6b174857617d31ad1b437d8e97d94 (patch) | |
| tree | 90fb5d8d63fa0c121eef355affce79d1d84a2bbe /include/scrnintstr.h | |
| parent | 60be452c2e88342f92a76ba5ec7d90b5b0211aaf (diff) | |
| parent | ea9c63e93b9bb731796e8a8de2d127e6cc720076 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
Diffstat (limited to 'include/scrnintstr.h')
| -rw-r--r-- | include/scrnintstr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scrnintstr.h b/include/scrnintstr.h index 0ca13526b..3b2cf9f81 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -203,7 +203,7 @@ typedef void (* ClipNotifyProcPtr)( /* pixmap will be the backing pixmap for a redirected window */ #define CREATE_PIXMAP_USAGE_BACKING_PIXMAP 2 /* pixmap will contain a glyph */ -#define CREATE_PIMXAP_USAGE_GLYPH_PICTURE 3 +#define CREATE_PIXMAP_USAGE_GLYPH_PICTURE 3 typedef PixmapPtr (* CreatePixmapProcPtr)( ScreenPtr /*pScreen*/, |