New header for XF86Bigfont server functions
Xext/xf86bigfont.c contains three non-static functions which are called elsewhere in the server. This creates a new header containing these declarations in order to fix several warnings: xf86bigfont.c:285: warning: no previous prototype for `XF86BigfontFreeFontShm' dixfonts.c:502: warning: implicit declaration of function `XF86BigfontFreeFontS$ dixfonts.c:502: warning: nested extern declaration of `XF86BigfontFreeFontShm' log.c:436: warning: implicit declaration of function `XF86BigfontCleanup' log.c:436: warning: nested extern declaration of `XF86BigfontCleanup' Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
parent
57a049ea89
commit
abf4e0b7e3
|
@ -107,7 +107,7 @@ MODULE_SRCS += $(MULTIBUFFER_SRCS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# XF86 Big Font extension
|
# XF86 Big Font extension
|
||||||
BIGFONT_SRCS = xf86bigfont.c
|
BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h
|
||||||
if XF86BIGFONT
|
if XF86BIGFONT
|
||||||
BUILTIN_SRCS += $(BIGFONT_SRCS)
|
BUILTIN_SRCS += $(BIGFONT_SRCS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -74,6 +74,7 @@
|
||||||
#include "protocol-versions.h"
|
#include "protocol-versions.h"
|
||||||
|
|
||||||
#include <X11/extensions/xf86bigfproto.h>
|
#include <X11/extensions/xf86bigfproto.h>
|
||||||
|
#include "xf86bigfontsrv.h"
|
||||||
|
|
||||||
static void XF86BigfontResetProc(
|
static void XF86BigfontResetProc(
|
||||||
ExtensionEntry * /* extEntry */
|
ExtensionEntry * /* extEntry */
|
||||||
|
|
|
@ -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
|
|
@ -71,8 +71,7 @@ Equipment Corporation.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XF86BIGFONT
|
#ifdef XF86BIGFONT
|
||||||
#define _XF86BIGFONT_SERVER_
|
#include "xf86bigfontsrv.h"
|
||||||
#include <X11/extensions/xf86bigfont.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics
|
#define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics
|
||||||
|
|
Loading…
Reference in New Issue