diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-28 18:31:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-28 18:31:14 +0000 |
| commit | e0fb25b6057c8531f855a9b24030b15619cc9f0b (patch) | |
| tree | fb79e2d44a1b3790d714d0c96aa94d81c7d0ac92 /xorg-server/Xext | |
| parent | bd81af89b3080963ed75ae17f48b1d7457350cda (diff) | |
| download | vcxsrv-e0fb25b6057c8531f855a9b24030b15619cc9f0b.tar.gz vcxsrv-e0fb25b6057c8531f855a9b24030b15619cc9f0b.tar.bz2 vcxsrv-e0fb25b6057c8531f855a9b24030b15619cc9f0b.zip | |
xserver git update 28-3-2010
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/xf86bigfont.c | 5 | ||||
| -rw-r--r-- | xorg-server/Xext/xf86bigfontsrv.h | 34 |
2 files changed, 37 insertions, 2 deletions
diff --git a/xorg-server/Xext/xf86bigfont.c b/xorg-server/Xext/xf86bigfont.c index ba8b60358..a4eb3f659 100644 --- a/xorg-server/Xext/xf86bigfont.c +++ b/xorg-server/Xext/xf86bigfont.c @@ -74,6 +74,7 @@ #include "protocol-versions.h" #include <X11/extensions/xf86bigfproto.h> +#include "xf86bigfontsrv.h" static void XF86BigfontResetProc( ExtensionEntry * /* extEntry */ @@ -143,7 +144,7 @@ CheckForShmSyscall(void) #endif void -XFree86BigfontExtensionInit() +XFree86BigfontExtensionInit(void) { if (AddExtension(XF86BIGFONTNAME, XF86BigfontNumberEvents, @@ -302,7 +303,7 @@ XF86BigfontFreeFontShm( /* Called upon fatal signal. */ void -XF86BigfontCleanup() +XF86BigfontCleanup(void) { #ifdef HAS_SHM while (ShmList) diff --git a/xorg-server/Xext/xf86bigfontsrv.h b/xorg-server/Xext/xf86bigfontsrv.h new file mode 100644 index 000000000..2c78dc4c9 --- /dev/null +++ b/xorg-server/Xext/xf86bigfontsrv.h @@ -0,0 +1,34 @@ +/* + * Copyright © 2010 Yaakov Selkowitz + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef _XF86BIGFONTSRV_H_ +#define _XF86BIGFONTSRV_H_ + +#include <X11/fonts/font.h> + +extern void XFree86BigfontExtensionInit(void); +extern void XF86BigfontFreeFontShm(FontPtr); +extern void XF86BigfontCleanup(void); + +#endif |