Index: config/cf/sco5.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sco5.cf,v
retrieving revision 1.8
diff -u -3 -p -r1.8 sco5.cf
--- config/cf/sco5.cf	21 Nov 2005 01:16:18 -0000	1.8
+++ config/cf/sco5.cf	20 Dec 2005 19:59:44 -0000
@@ -69,7 +69,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1
 #endif
 
 #ifndef UseExportLists
-# define UseExportLists		YES
+# define UseExportLists		NO
 #endif
 
 #define StandardDefines		-DSYSV -Di386 -DSCO325 -D__SCO__
Index: config/cf/usl.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/usl.cf,v
retrieving revision 1.4
diff -u -3 -p -r1.4 usl.cf
--- config/cf/usl.cf	21 Nov 2005 01:16:18 -0000	1.4
+++ config/cf/usl.cf	20 Dec 2005 19:59:44 -0000
@@ -159,7 +159,7 @@ XCOMM operating system: OSName (OSMajorV
 #endif
 
 #ifndef UseExportLists
-# define UseExportLists		YES
+# define UseExportLists		NO
 #endif
 
 #define GencatFlags		-m
Index: lib/misc/snprintf.c
===================================================================
RCS file: /cvs/xorg/xc/lib/misc/snprintf.c,v
retrieving revision 1.3
diff -u -3 -p -r1.3 snprintf.c
--- lib/misc/snprintf.c	3 Dec 2004 11:57:42 -0000	1.3
+++ lib/misc/snprintf.c	20 Dec 2005 19:59:45 -0000
@@ -355,7 +355,11 @@ conv_10(wide_int num, bool_int is_unsign
  * Do format conversion.
  */
 SCOPE int 
+#if (defined(__UNIXWARE__) || defined(__OPENSERVER)) && !defined(__GNUC__)
+vsnprintf(char *str, size_t size, const char *fmt, _VA_LIST ap)
+#else
 vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
+#endif
 {
     char *sp;
     char *bep;
Index: lib/misc/snprintf.h
===================================================================
RCS file: /cvs/xorg/xc/lib/misc/snprintf.h,v
retrieving revision 1.2
diff -u -3 -p -r1.2 snprintf.h
--- lib/misc/snprintf.h	23 Apr 2004 18:44:25 -0000	1.2
+++ lib/misc/snprintf.h	20 Dec 2005 19:59:45 -0000
@@ -24,7 +24,11 @@
 #endif
 
 extern int snprintf (char *str, size_t count, const char *fmt, ...);
+#if (defined(__UNIXWARE__) || defined(__OPENSERVER)) && !defined(__GNUC__)
+extern int vsnprintf (char *str, size_t count, const char *fmt, _VA_LIST arg);
+#else
 extern int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
+#endif
 
 #endif /* HAS_SNPRINTF */
 
Index: programs/Xserver/hw/xfree86/loader/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/Imakefile,v
retrieving revision 1.11
diff -u -3 -p -r1.11 Imakefile
--- programs/Xserver/hw/xfree86/loader/Imakefile	8 Nov 2005 06:33:29 -0000	1.11
+++ programs/Xserver/hw/xfree86/loader/Imakefile	20 Dec 2005 19:59:46 -0000
@@ -89,7 +89,7 @@ libcrt.a: /usr/ccs/lib/libcrt.a
 	rm -f libcrt.a
 	cp /usr/ccs/lib/libcrt.a libcrt.a
 
-InstallLibraryModule(crt,$(MODULEDIR),.)
+InstallDynamicModule(libcrt.a,$(MODULEDIR),.)
 
 XCOMM loader needs to know the location of modules to load libcrt.a
 SpecialCObjectRule(loader,NullParameter,$(MODULEDEFINES))
