diff options
| -rw-r--r-- | Xext/Makefile.am | 2 | ||||
| -rw-r--r-- | Xext/xf86bigfont.c | 1 | ||||
| -rw-r--r-- | Xext/xf86bigfontsrv.h | 34 | ||||
| -rw-r--r-- | dix/dixfonts.c | 3 | ||||
| -rw-r--r-- | os/log.c | 3 |
5 files changed, 38 insertions, 5 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 193d6e5cb..53cbc1fbd 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -107,7 +107,7 @@ MODULE_SRCS += $(MULTIBUFFER_SRCS) endif # XF86 Big Font extension -BIGFONT_SRCS = xf86bigfont.c +BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h if XF86BIGFONT BUILTIN_SRCS += $(BIGFONT_SRCS) endif diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index ce33fda8b..a4eb3f659 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -74,6 +74,7 @@ #include "protocol-versions.h" #include <X11/extensions/xf86bigfproto.h> +#include "xf86bigfontsrv.h" static void XF86BigfontResetProc( ExtensionEntry * /* extEntry */ diff --git a/Xext/xf86bigfontsrv.h b/Xext/xf86bigfontsrv.h new file mode 100644 index 000000000..2c78dc4c9 --- /dev/null +++ b/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 diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 329318d5d..6dc819313 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -71,8 +71,7 @@ Equipment Corporation. #endif #ifdef XF86BIGFONT -#define _XF86BIGFONT_SERVER_ -#include <X11/extensions/xf86bigfont.h> +#include "xf86bigfontsrv.h" #endif #define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics @@ -99,8 +99,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #ifdef XF86BIGFONT -#define _XF86BIGFONT_SERVER_ -#include <X11/extensions/xf86bigfont.h> +#include "xf86bigfontsrv.h" #endif #ifdef DDXOSVERRORF |