merge latest (4.3.99.16) from XFree86 (vendor) branch

hw/xnest/Font.c

@@ -12,13 +12,13 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.5 2001/01/17 22:36:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */
 
 #include "X.h"
 #include "Xatom.h"
 #include "Xproto.h"
 #include "misc.h"
-#include "miscstruct.h"
+#include "regionstr.h"
 #include "font.h"
 #include "fontstruct.h"
 #include "scrnintstr.h"
@@ -30,9 +30,8 @@ is" without express or implied warranty.
 
 int xnestFontPrivateIndex;
 
-Bool xnestRealizeFont(pScreen, pFont)
-    ScreenPtr pScreen;
-    FontPtr pFont;
+Bool
+xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)
 {
   pointer priv;
   Atom name_atom, value_atom;
@@ -75,9 +74,8 @@ Bool xnestRealizeFont(pScreen, pFont)
 }
 
 
-Bool xnestUnrealizeFont(pScreen, pFont)
-    ScreenPtr pScreen;
-    FontPtr pFont;
+Bool
+xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
 {
   if (xnestFontPriv(pFont)) {
     if (xnestFontStruct(pFont))