15 files changed, 70 insertions, 0 deletions
diff --git a/lib/libXfont/src/stubs/cauthgen.c b/lib/libXfont/src/stubs/cauthgen.c
index 06f1a343f..026c52d17 100644
--- a/lib/libXfont/src/stubs/cauthgen.c
+++ b/lib/libXfont/src/stubs/cauthgen.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak client_auth_generation
+#endif
+
 weak int
 client_auth_generation(ClientPtr client)
 {
diff --git a/lib/libXfont/src/stubs/csignal.c b/lib/libXfont/src/stubs/csignal.c
index 3e102ccd0..e6fdeae1b 100644
--- a/lib/libXfont/src/stubs/csignal.c
+++ b/lib/libXfont/src/stubs/csignal.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak ClientSignal
+#endif
+
 weak Bool
 ClientSignal(ClientPtr client)
 {
diff --git a/lib/libXfont/src/stubs/delfntcid.c b/lib/libXfont/src/stubs/delfntcid.c
index 0b0a747b5..ca713286c 100644
--- a/lib/libXfont/src/stubs/delfntcid.c
+++ b/lib/libXfont/src/stubs/delfntcid.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak DeleteFontClientID
+#endif
+
 weak void
 DeleteFontClientID(Font id)
 {
diff --git a/lib/libXfont/src/stubs/errorf.c b/lib/libXfont/src/stubs/errorf.c
index 28872e2f8..fd32965a4 100644
--- a/lib/libXfont/src/stubs/errorf.c
+++ b/lib/libXfont/src/stubs/errorf.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak ErrorF
+#endif
+
 weak void
 ErrorF(const char *f, ...)
 {
diff --git a/lib/libXfont/src/stubs/fatalerror.c b/lib/libXfont/src/stubs/fatalerror.c
index 295593ea6..1549ad3ea 100644
--- a/lib/libXfont/src/stubs/fatalerror.c
+++ b/lib/libXfont/src/stubs/fatalerror.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak FatalError
+#endif
+
 weak void
 FatalError(const char *f, ...)
 {
diff --git a/lib/libXfont/src/stubs/findoldfnt.c b/lib/libXfont/src/stubs/findoldfnt.c
index 22bd8c1d1..7a0008409 100644
--- a/lib/libXfont/src/stubs/findoldfnt.c
+++ b/lib/libXfont/src/stubs/findoldfnt.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak find_old_font
+#endif
+
 weak FontPtr
 find_old_font(FSID id)
 {
diff --git a/lib/libXfont/src/stubs/fontmod.c b/lib/libXfont/src/stubs/fontmod.c
new file mode 100644
index 000000000..5a0bd0e9d
--- /dev/null
+++ b/lib/libXfont/src/stubs/fontmod.c
@@ -0,0 +1,14 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef LOADABLEFONTS
+#include "stubs.h"
+#include <X11/fonts/fontmod.h>
+
+#ifdef __SUNPRO_C
+#pragma weak FontModuleList
+#endif
+
+weak FontModule *FontModuleList;
+#endif /* LOADABLEFONTS */
diff --git a/lib/libXfont/src/stubs/getcres.c b/lib/libXfont/src/stubs/getcres.c
index b564f24e6..0b98f46e3 100644
--- a/lib/libXfont/src/stubs/getcres.c
+++ b/lib/libXfont/src/stubs/getcres.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak GetClientResolutions
+#endif
+
 weak FontResolutionPtr
 GetClientResolutions(int *num)
 {
diff --git a/lib/libXfont/src/stubs/getdefptsize.c b/lib/libXfont/src/stubs/getdefptsize.c
index 11804ddb0..0b9e40999 100644
--- a/lib/libXfont/src/stubs/getdefptsize.c
+++ b/lib/libXfont/src/stubs/getdefptsize.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak GetDefaultPointSize
+#endif
+
 weak int
 GetDefaultPointSize(void)
 {
diff --git a/lib/libXfont/src/stubs/getnewfntcid.c b/lib/libXfont/src/stubs/getnewfntcid.c
index aefc55372..e2fe8bb15 100644
--- a/lib/libXfont/src/stubs/getnewfntcid.c
+++ b/lib/libXfont/src/stubs/getnewfntcid.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak GetNewFontClientID
+#endif
+
 weak Font
 GetNewFontClientID(void)
 {
diff --git a/lib/libXfont/src/stubs/gettime.c b/lib/libXfont/src/stubs/gettime.c
index 1aca1cc56..7b2d3b34c 100644
--- a/lib/libXfont/src/stubs/gettime.c
+++ b/lib/libXfont/src/stubs/gettime.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak GetTimeInMillis
+#endif
+
 weak unsigned long
 GetTimeInMillis (void)
 {
diff --git a/lib/libXfont/src/stubs/initfshdl.c b/lib/libXfont/src/stubs/initfshdl.c
index faee9f64d..a14dafffc 100644
--- a/lib/libXfont/src/stubs/initfshdl.c
+++ b/lib/libXfont/src/stubs/initfshdl.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak init_fs_handlers
+#endif
+
 weak int
 init_fs_handlers(FontPathElementPtr fpe,
                  BlockHandlerProcPtr block_handler)
diff --git a/lib/libXfont/src/stubs/servclient.c b/lib/libXfont/src/stubs/servclient.c
index ae51621bf..9b6cebb3f 100644
--- a/lib/libXfont/src/stubs/servclient.c
+++ b/lib/libXfont/src/stubs/servclient.c
@@ -3,4 +3,8 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak serverClient
+#endif
+
 weak void *serverClient = 0;
diff --git a/lib/libXfont/src/stubs/setfntauth.c b/lib/libXfont/src/stubs/setfntauth.c
index 01d18b125..0c7ecccde 100644
--- a/lib/libXfont/src/stubs/setfntauth.c
+++ b/lib/libXfont/src/stubs/setfntauth.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak set_font_authorizations
+#endif
+
 weak int
 set_font_authorizations(char **authorizations, int *authlen, ClientPtr client)
 {
diff --git a/lib/libXfont/src/stubs/stfntcfnt.c b/lib/libXfont/src/stubs/stfntcfnt.c
index bf88505b7..5fc17452f 100644
--- a/lib/libXfont/src/stubs/stfntcfnt.c
+++ b/lib/libXfont/src/stubs/stfntcfnt.c
@@ -3,6 +3,10 @@
 #endif
 #include "stubs.h"
 
+#ifdef __SUNPRO_C
+#pragma weak StoreFontClientFont
+#endif
+
 weak int
 StoreFontClientFont(FontPtr pfont, Font id)
 {