[xserver-commit] xfree86/loader Makefile.am,1.2,1.3 dixsym.c,1.65,1.66 loadfont.c,1.6,1.7

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86/loader
In directory pdx:/tmp/cvs-serv31169/loader

Modified Files:
	Makefile.am dixsym.c loadfont.c 
Log Message:
common/xf86.h: s/static/extern/ for noXkbExtension - whoops.
Makefile.am, loader/*: Get the loader stuff going (sort of - this is
omgdodgyhack).


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/loader/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.am	19 Feb 2004 14:02:16 -0000	1.2
+++ b/Makefile.am	7 Mar 2004 11:07:58 -0000	1.3
@@ -3,5 +3,5 @@
 
 lib_LIBRARIES = libxf86loader.a
 libxf86loader_a_SOURCES = dlloader.c hash.c loader.c loadmod.c loadfont.c \
-                          loadext.c os.c dixsym.c misym.c xf86sym.c fontsym.c \
+                          loadext.c os.c dixsym.c misym.c \
                           extsym.c $(SPARCSRCS)

Index: dixsym.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/dixsym.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- a/dixsym.c	28 Feb 2004 01:27:52 -0000	1.65
+++ b/dixsym.c	7 Mar 2004 11:07:58 -0000	1.66
@@ -195,7 +195,7 @@
     SYMFUNC(VerifyRectOrder)
     SYMFUNC(SetDashes)
     /* globals.c */
-    SYMVAR(DPMSEnabled)
+/*    SYMVAR(DPMSEnabled)
     SYMVAR(DPMSCapableFlag)
     SYMVAR(DPMSOffTime)
     SYMVAR(DPMSPowerLevel)
@@ -203,7 +203,7 @@
     SYMVAR(DPMSSuspendTime)
     SYMVAR(DPMSEnabledSwitch)
     SYMVAR(DPMSDisabledSwitch)
-    SYMVAR(defaultDPMSEnabled)
+    SYMVAR(defaultDPMSEnabled) */
     /* bigreq */
     SYMVAR(maxBigRequestSize)
 #ifdef XV
@@ -320,11 +320,11 @@
     SYMVAR(noTestExtensions)
     SYMFUNC(GiveUp)
     /* log.c */
-    SYMFUNC(LogVWrite)
+    /*SYMFUNC(LogVWrite)
     SYMFUNC(LogWrite)
     SYMFUNC(LogVMessageVerb)
     SYMFUNC(LogMessageVerb)
-    SYMFUNC(LogMessage)
+    SYMFUNC(LogMessage) */
     SYMFUNC(FatalError)
     SYMFUNC(VErrorF)
     SYMFUNC(ErrorF)

Index: loadfont.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/loadfont.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/loadfont.c	28 Feb 2004 01:27:54 -0000	1.6
+++ b/loadfont.c	7 Mar 2004 11:07:58 -0000	1.7
@@ -35,6 +35,7 @@
 #include "loaderProcs.h"
 #include "misc.h"
 #include "xf86.h"
+#include <X11/fonts/fontmod.h>
 
 FontModule *FontModuleList = NULL;
 static int numFontModules = 0;