[xorg-commit-diffs] xc/programs/Xserver/include os.h, 1.1.4.5, 1.1.4.6

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/include
In directory pdx:/tmp/cvs-serv5532/programs/Xserver/include

Modified Files:
      Tag: XORG-CURRENT
	os.h 
Log Message:
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 - Land XPRINT branch on XORG-CURRENT

Index: os.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/include/os.h,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/os.h	15 Apr 2004 10:17:21 -0000	1.1.4.5
+++ b/os.h	21 Apr 2004 10:03:41 -0000	1.1.4.6
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/os.h,v 3.53 2003/10/29 04:17:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -231,6 +231,8 @@
 
 extern void UseMsg(void);
 
+extern void InitGlobals(void);
+
 extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
 
 extern int set_font_authorizations(
@@ -412,6 +414,8 @@
 extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/);
 #endif
 
+extern void ddxInitGlobals(void);
+
 extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
 
 extern void ddxUseMsg(void);