Fix compilation of xf86bigfont.c
xf86bigfont.c: In function 'XFree86BigfontExtensionInit':
xf86bigfont.c:146: error: 'ProcXF86BigfontDispatch' undeclared (first use in this function)
xf86bigfont.c:147: error: 'SProcXF86BigfontDispatch' undeclared (first use in this function)
It seems this has been broken since commit cbd4d5dbb7
"delete pervasively use of DISPATCH_PROC" (2010-09-28), which is a bit worrying as
that presumably indicates that no tinderbox is configuring with --enable-xf86bigfont.
In a similar fashion to that commit, fix by moving XFree86BigfontExtensionInit()
below the definitions of the static dispatch functions it references.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
parent
be3be7580b
commit
a9d3c43a57
|
@ -137,51 +137,6 @@ CheckForShmSyscall(void)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void
|
|
||||||
XFree86BigfontExtensionInit(void)
|
|
||||||
{
|
|
||||||
if (AddExtension(XF86BIGFONTNAME,
|
|
||||||
XF86BigfontNumberEvents,
|
|
||||||
XF86BigfontNumberErrors,
|
|
||||||
ProcXF86BigfontDispatch,
|
|
||||||
SProcXF86BigfontDispatch,
|
|
||||||
XF86BigfontResetProc,
|
|
||||||
StandardMinorOpcode)) {
|
|
||||||
#ifdef HAS_SHM
|
|
||||||
#ifdef MUST_CHECK_FOR_SHM_SYSCALL
|
|
||||||
/*
|
|
||||||
* Note: Local-clients will not be optimized without shared memory
|
|
||||||
* support. Remote-client optimization does not depend on shared
|
|
||||||
* memory support. Thus, the extension is still registered even
|
|
||||||
* when shared memory support is not functional.
|
|
||||||
*/
|
|
||||||
if (!CheckForShmSyscall()) {
|
|
||||||
ErrorF(XF86BIGFONTNAME " extension local-client optimization disabled due to lack of shared memory support in the kernel\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
srand((unsigned int) time(NULL));
|
|
||||||
signature = ((unsigned int) (65536.0/(RAND_MAX+1.0) * rand()) << 16)
|
|
||||||
+ (unsigned int) (65536.0/(RAND_MAX+1.0) * rand());
|
|
||||||
/* fprintf(stderr, "signature = 0x%08X\n", signature); */
|
|
||||||
|
|
||||||
FontShmdescIndex = AllocateFontPrivateIndex();
|
|
||||||
|
|
||||||
#if !defined(CSRG_BASED) && !defined(__CYGWIN__)
|
|
||||||
pagesize = SHMLBA;
|
|
||||||
#else
|
|
||||||
# ifdef _SC_PAGESIZE
|
|
||||||
pagesize = sysconf(_SC_PAGESIZE);
|
|
||||||
# else
|
|
||||||
pagesize = getpagesize();
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ========== Management of shared memory segments ========== */
|
/* ========== Management of shared memory segments ========== */
|
||||||
|
|
||||||
#ifdef HAS_SHM
|
#ifdef HAS_SHM
|
||||||
|
@ -749,3 +704,47 @@ SProcXF86BigfontDispatch(
|
||||||
return BadRequest;
|
return BadRequest;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
XFree86BigfontExtensionInit(void)
|
||||||
|
{
|
||||||
|
if (AddExtension(XF86BIGFONTNAME,
|
||||||
|
XF86BigfontNumberEvents,
|
||||||
|
XF86BigfontNumberErrors,
|
||||||
|
ProcXF86BigfontDispatch,
|
||||||
|
SProcXF86BigfontDispatch,
|
||||||
|
XF86BigfontResetProc,
|
||||||
|
StandardMinorOpcode)) {
|
||||||
|
#ifdef HAS_SHM
|
||||||
|
#ifdef MUST_CHECK_FOR_SHM_SYSCALL
|
||||||
|
/*
|
||||||
|
* Note: Local-clients will not be optimized without shared memory
|
||||||
|
* support. Remote-client optimization does not depend on shared
|
||||||
|
* memory support. Thus, the extension is still registered even
|
||||||
|
* when shared memory support is not functional.
|
||||||
|
*/
|
||||||
|
if (!CheckForShmSyscall()) {
|
||||||
|
ErrorF(XF86BIGFONTNAME " extension local-client optimization disabled due to lack of shared memory support in the kernel\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
srand((unsigned int) time(NULL));
|
||||||
|
signature = ((unsigned int) (65536.0/(RAND_MAX+1.0) * rand()) << 16)
|
||||||
|
+ (unsigned int) (65536.0/(RAND_MAX+1.0) * rand());
|
||||||
|
/* fprintf(stderr, "signature = 0x%08X\n", signature); */
|
||||||
|
|
||||||
|
FontShmdescIndex = AllocateFontPrivateIndex();
|
||||||
|
|
||||||
|
#if !defined(CSRG_BASED) && !defined(__CYGWIN__)
|
||||||
|
pagesize = SHMLBA;
|
||||||
|
#else
|
||||||
|
# ifdef _SC_PAGESIZE
|
||||||
|
pagesize = sysconf(_SC_PAGESIZE);
|
||||||
|
# else
|
||||||
|
pagesize = getpagesize();
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user