summaryrefslogtreecommitdiff
path: root/hw/xnest/Args.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
commit2fb588620030ad393f8500d60e16144d59e4effe (patch)
tree07262cbe15a40e5aeae54f62751260f83243ab79 /hw/xnest/Args.c
parent0664db19bf37f9dd69cca6adff4e238e310c3092 (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'hw/xnest/Args.c')
-rw-r--r--hw/xnest/Args.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 488179d01..cc9a2707f 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
@@ -47,6 +47,11 @@ int xnestNumScreens = 0;
Bool xnestDoDirectColormaps = False;
Window xnestParentWindow = 0;
+/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
+void ddxInitGlobals(void)
+{
+}
+
int
ddxProcessArgument (int argc, char *argv[], int i)
{