[xserver-commit] xfree86/loader aoutloader.c,1.21,1.22 coffloader.c,1.23,1.24 dixsym.c,1.64,1.65 dlloader.c,1.14,1.15 elfloader.c,1.63,1.64 extsym.c,1.10,1.11 fontsym.c,1.15,1.16 hash.c,1.26,1.27 loader.c,1.72,1.73 loaderProcs.h,1.22,1.23 loadext.c,1.9,1.10 loadfont.c,1.5,1.6 loadmod.c,1.74,1.75 misym.c,1.39,1.40 os.c,1.5,1.6 os2funcs.c,1.9,1.10 xf86sym.c,1.243,1.244

[Keith Packard]

Committed by: keithp

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

Modified Files:
	aoutloader.c coffloader.c dixsym.c dlloader.c elfloader.c 
	extsym.c fontsym.c hash.c loader.c loaderProcs.h loadext.c 
	loadfont.c loadmod.c misym.c os.c os2funcs.c xf86sym.c 
Log Message:
	* Makefile.am
	* *.c
	Ok, everyone gets #include <config.h>
	Other than that, I fixed a few extension header paths and
	whacked at the Makefile.am.  Makefile.am is a hacked version
	of xserver/Makefile.am; expect them to diverge until we can
	stick the xfree86 DDX stuff into the standard Makefile.am.


Index: aoutloader.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/aoutloader.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- a/aoutloader.c	19 Feb 2004 03:51:37 -0000	1.21
+++ b/aoutloader.c	28 Feb 2004 01:27:52 -0000	1.22
@@ -25,6 +25,9 @@
  *
  * Modified 21/02/97 by Sebastien Marineau to support OS/2 a.out objects
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>

Index: coffloader.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/coffloader.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- a/coffloader.c	19 Feb 2004 03:51:37 -0000	1.23
+++ b/coffloader.c	28 Feb 2004 01:27:52 -0000	1.24
@@ -22,6 +22,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>

Index: dixsym.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/dixsym.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- a/dixsym.c	19 Feb 2004 03:51:37 -0000	1.64
+++ b/dixsym.c	28 Feb 2004 01:27:52 -0000	1.65
@@ -48,6 +48,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #undef DBMALLOC
 #include "sym.h"
 #include "colormap.h"

Index: dlloader.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/dlloader.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/dlloader.c	19 Feb 2004 03:51:37 -0000	1.14
+++ b/dlloader.c	28 Feb 2004 01:27:52 -0000	1.15
@@ -25,6 +25,9 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <dlfcn.h>

Index: elfloader.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/elfloader.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- a/elfloader.c	19 Feb 2004 03:51:37 -0000	1.63
+++ b/elfloader.c	28 Feb 2004 01:27:52 -0000	1.64
@@ -22,6 +22,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #ifndef __UNIXOS2__
 #include <sys/mman.h>

Index: extsym.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/extsym.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/extsym.c	19 Feb 2004 03:51:37 -0000	1.10
+++ b/extsym.c	28 Feb 2004 01:27:52 -0000	1.11
@@ -24,6 +24,9 @@
  * SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "resource.h"
 #include "sym.h"
 #include "misc.h"

Index: fontsym.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/fontsym.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/fontsym.c	19 Feb 2004 03:51:37 -0000	1.15
+++ b/fontsym.c	28 Feb 2004 01:27:52 -0000	1.16
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "font.h"
 #include "sym.h"
 #include "fntfilst.h"

Index: hash.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/hash.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- a/hash.c	19 Feb 2004 03:51:37 -0000	1.26
+++ b/hash.c	28 Feb 2004 01:27:52 -0000	1.27
@@ -23,6 +23,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "os.h"
 #include <X11/Xos.h>
 #undef abs

Index: loader.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/loader.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- a/loader.c	19 Feb 2004 03:51:37 -0000	1.72
+++ b/loader.c	28 Feb 2004 01:27:52 -0000	1.73
@@ -48,6 +48,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

Index: loaderProcs.h
===================================================================
RCS file: /cvs/xserver/xfree86/loader/loaderProcs.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- a/loaderProcs.h	19 Feb 2004 03:51:37 -0000	1.22
+++ b/loaderProcs.h	28 Feb 2004 01:27:54 -0000	1.23
@@ -54,7 +54,10 @@
 
 #define IN_LOADER
 #include "xf86Module.h"
+#undef LOADABLE_FONT_MODULES
+#if LOADABLE_FONT_MODULES
 #include <X11/fonts/fontmod.h>
+#endif
 
 typedef struct module_desc {
     struct module_desc *child;
@@ -89,7 +92,9 @@
 			    const char **, const char **, pointer,
 			    const XF86ModReqInfo *, int *, int *);
 ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);
+#if LOADABLE_FONT_MODULES
 void LoadFont(FontModule *);
+#endif
 void UnloadModule(ModuleDescPtr);
 void UnloadSubModule(ModuleDescPtr);
 void UnloadDriver(ModuleDescPtr);

Index: loadext.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/loadext.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/loadext.c	19 Feb 2004 03:51:37 -0000	1.9
+++ b/loadext.c	28 Feb 2004 01:27:54 -0000	1.10
@@ -28,6 +28,9 @@
 
 /* Maybe this file belongs elsewhere? */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define LOADERDECLARATIONS
 #include "loaderProcs.h"
 #include "misc.h"

Index: loadfont.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/loadfont.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/loadfont.c	19 Feb 2004 03:51:37 -0000	1.5
+++ b/loadfont.c	28 Feb 2004 01:27:54 -0000	1.6
@@ -28,6 +28,9 @@
 
 /* Maybe this file belongs in lib/font/fontfile/module/ ? */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define LOADERDECLARATIONS
 #include "loaderProcs.h"
 #include "misc.h"

Index: loadmod.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/loadmod.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- a/loadmod.c	19 Feb 2004 03:51:37 -0000	1.74
+++ b/loadmod.c	28 Feb 2004 01:27:54 -0000	1.75
@@ -49,6 +49,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "os.h"
 /* For stat() and related stuff */
 #define NO_OSLIB_PROTOTYPES

Index: misym.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/misym.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- a/misym.c	19 Feb 2004 03:51:37 -0000	1.39
+++ b/misym.c	28 Feb 2004 01:27:54 -0000	1.40
@@ -50,6 +50,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "sym.h"
 #include "misc.h"
 #include "mi.h"

Index: os.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/os.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/os.c	19 Feb 2004 03:51:37 -0000	1.5
+++ b/os.c	28 Feb 2004 01:27:54 -0000	1.6
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "loaderProcs.h"
 #include "xf86.h"
 

Index: os2funcs.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/os2funcs.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/os2funcs.c	19 Feb 2004 03:51:37 -0000	1.9
+++ b/os2funcs.c	28 Feb 2004 01:27:54 -0000	1.10
@@ -33,6 +33,9 @@
  * the requests. We create a heap of 2 megs, hopefully enough for now.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define I_NEED_OS2_H
 #define INCL_DOSMEMMGR
 #include <os2.h>

Index: xf86sym.c
===================================================================
RCS file: /cvs/xserver/xfree86/loader/xf86sym.c,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- a/xf86sym.c	19 Feb 2004 03:51:37 -0000	1.243
+++ b/xf86sym.c	28 Feb 2004 01:27:54 -0000	1.244
@@ -49,6 +49,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define INCLUDE_DEPRECATED 1
 
 #include <fcntl.h>