aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-23 14:53:26 +0100
committermarha <marha@users.sourceforge.net>2012-01-23 14:53:26 +0100
commitcef399a3d6b092873d3074d10c289299c2ce094e (patch)
tree3881f9629d6469f78b71fd0463b86de17e817c6b
parent27784896353d83f6228df93ff9ee28c1851f6a8f (diff)
downloadvcxsrv-cef399a3d6b092873d3074d10c289299c2ce094e.tar.gz
vcxsrv-cef399a3d6b092873d3074d10c289299c2ce094e.tar.bz2
vcxsrv-cef399a3d6b092873d3074d10c289299c2ce094e.zip
Enabled XFree86 BigFont extension
-rw-r--r--include/dix-config.h2
-rw-r--r--xorg-server/Xext/Makefile2
-rw-r--r--xorg-server/Xext/xf86bigfont.c5
3 files changed, 7 insertions, 2 deletions
diff --git a/include/dix-config.h b/include/dix-config.h
index 7f362917c..24c525480 100644
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -327,7 +327,7 @@
#define XDMCP 1
/* Build XFree86 BigFont extension */
-#undef XF86BIGFONT
+#define XF86BIGFONT 1
/* Support XFree86 Video Mode extension */
#undef XF86VIDMODE
diff --git a/xorg-server/Xext/Makefile b/xorg-server/Xext/Makefile
index 1fd048d52..60907a1b3 100644
--- a/xorg-server/Xext/Makefile
+++ b/xorg-server/Xext/Makefile
@@ -14,6 +14,7 @@ xtest.c \
geext.c \
panoramiX.c \
panoramiXprocs.c \
+xf86bigfont.c \
panoramiXSwap.c
#shm.c \
@@ -22,7 +23,6 @@ panoramiXSwap.c
#mbufbf.c \
#mbufpx.c \
#xcalibrate.c \
-#xf86bigfont.c \
#xprint.c \
#xselinux.c \
#xvdisp.c \
diff --git a/xorg-server/Xext/xf86bigfont.c b/xorg-server/Xext/xf86bigfont.c
index 4b63a13a1..e56370152 100644
--- a/xorg-server/Xext/xf86bigfont.c
+++ b/xorg-server/Xext/xf86bigfont.c
@@ -291,8 +291,13 @@ ProcXF86BigfontQueryVersion(
reply.sequenceNumber = client->sequence;
reply.majorVersion = SERVER_XF86BIGFONT_MAJOR_VERSION;
reply.minorVersion = SERVER_XF86BIGFONT_MINOR_VERSION;
+ #ifdef WIN32
+ reply.uid = 0;
+ reply.gid = 0;
+ #else
reply.uid = geteuid();
reply.gid = getegid();
+ #endif
#ifdef HAS_SHM
reply.signature = signature;
#else