diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-28 18:36:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-28 18:36:59 +0000 |
| commit | ec2f03bcf805b62d93d3d95c184e671e9e32f9c3 (patch) | |
| tree | 043dc4679579e3fb114bbe44443d6745b184d84c /xorg-server/Xext/xf86bigfont.c | |
| parent | 447df0677e8b9998c47d541a041f0a6bb480e601 (diff) | |
| download | vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.tar.gz vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.tar.bz2 vcxsrv-ec2f03bcf805b62d93d3d95c184e671e9e32f9c3.zip | |
svn merge -r509:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/Xext/xf86bigfont.c')
| -rw-r--r-- | xorg-server/Xext/xf86bigfont.c | 5 |
1 files changed, 3 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) |