summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@roadrock.(none)>2007-04-03 16:05:48 +0200
committerMatthieu Herrb <matthieu@roadrock.(none)>2007-04-03 16:05:48 +0200
commit224fb6403a328e70b370540cc5cefd74421fafac (patch)
treed07e95c37160a955ccb02ac63ce846ed39e2ed28
parente7a59cfb5d442d2965cfcffeff405a4b05591190 (diff)
parent0fbb37ccc630ced42d6a973c81d947870cca7637 (diff)
Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/lib/libXfont
-rw-r--r--src/stubs/cauthgen.c4
-rw-r--r--src/stubs/csignal.c4
-rw-r--r--src/stubs/delfntcid.c4
-rw-r--r--src/stubs/errorf.c4
-rw-r--r--src/stubs/fatalerror.c4
-rw-r--r--src/stubs/findoldfnt.c4
-rw-r--r--src/stubs/fontmod.c4
-rw-r--r--src/stubs/getcres.c4
-rw-r--r--src/stubs/getdefptsize.c4
-rw-r--r--src/stubs/getnewfntcid.c4
-rw-r--r--src/stubs/gettime.c4
-rw-r--r--src/stubs/initfshdl.c4
-rw-r--r--src/stubs/regfpefunc.c4
-rw-r--r--src/stubs/rmfshdl.c4
-rw-r--r--src/stubs/servclient.c4
-rw-r--r--src/stubs/setfntauth.c4
-rw-r--r--src/stubs/stfntcfnt.c4
-rw-r--r--src/stubs/xpstubs.c5
-rw-r--r--src/util/atom.c12
-rw-r--r--src/util/miscutil.c12
20 files changed, 96 insertions, 1 deletions
diff --git a/src/stubs/cauthgen.c b/src/stubs/cauthgen.c
index 06f1a34..026c52d 100644
--- a/src/stubs/cauthgen.c
+++ b/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/src/stubs/csignal.c b/src/stubs/csignal.c
index 3e102cc..e6fdeae 100644
--- a/src/stubs/csignal.c
+++ b/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/src/stubs/delfntcid.c b/src/stubs/delfntcid.c
index 0b0a747..ca71328 100644
--- a/src/stubs/delfntcid.c
+++ b/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/src/stubs/errorf.c b/src/stubs/errorf.c
index 28872e2..fd32965 100644
--- a/src/stubs/errorf.c
+++ b/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/src/stubs/fatalerror.c b/src/stubs/fatalerror.c
index 295593e..1549ad3 100644
--- a/src/stubs/fatalerror.c
+++ b/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/src/stubs/findoldfnt.c b/src/stubs/findoldfnt.c
index 22bd8c1..7a00084 100644
--- a/src/stubs/findoldfnt.c
+++ b/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/src/stubs/fontmod.c b/src/stubs/fontmod.c
index d890b8d..5a0bd0e 100644
--- a/src/stubs/fontmod.c
+++ b/src/stubs/fontmod.c
@@ -6,5 +6,9 @@
#include "stubs.h"
#include <X11/fonts/fontmod.h>
+#ifdef __SUNPRO_C
+#pragma weak FontModuleList
+#endif
+
weak FontModule *FontModuleList;
#endif /* LOADABLEFONTS */
diff --git a/src/stubs/getcres.c b/src/stubs/getcres.c
index b564f24..0b98f46 100644
--- a/src/stubs/getcres.c
+++ b/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/src/stubs/getdefptsize.c b/src/stubs/getdefptsize.c
index 11804dd..0b9e409 100644
--- a/src/stubs/getdefptsize.c
+++ b/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/src/stubs/getnewfntcid.c b/src/stubs/getnewfntcid.c
index aefc553..e2fe8bb 100644
--- a/src/stubs/getnewfntcid.c
+++ b/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/src/stubs/gettime.c b/src/stubs/gettime.c
index 1aca1cc..7b2d3b3 100644
--- a/src/stubs/gettime.c
+++ b/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/src/stubs/initfshdl.c b/src/stubs/initfshdl.c
index faee9f6..a14daff 100644
--- a/src/stubs/initfshdl.c
+++ b/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/src/stubs/regfpefunc.c b/src/stubs/regfpefunc.c
index 67e43b3..a79b4bf 100644
--- a/src/stubs/regfpefunc.c
+++ b/src/stubs/regfpefunc.c
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak RegisterFPEFunctions
+#endif
+
weak int
RegisterFPEFunctions(NameCheckFunc name_func,
InitFpeFunc init_func,
diff --git a/src/stubs/rmfshdl.c b/src/stubs/rmfshdl.c
index 1f87744..d0bdd3d 100644
--- a/src/stubs/rmfshdl.c
+++ b/src/stubs/rmfshdl.c
@@ -3,6 +3,10 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak remove_fs_handlers
+#endif
+
weak void
remove_fs_handlers(FontPathElementPtr fpe,
BlockHandlerProcPtr blockHandler,
diff --git a/src/stubs/servclient.c b/src/stubs/servclient.c
index ae51621..9b6cebb 100644
--- a/src/stubs/servclient.c
+++ b/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/src/stubs/setfntauth.c b/src/stubs/setfntauth.c
index 01d18b1..0c7eccc 100644
--- a/src/stubs/setfntauth.c
+++ b/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/src/stubs/stfntcfnt.c b/src/stubs/stfntcfnt.c
index bf88505..5fc1745 100644
--- a/src/stubs/stfntcfnt.c
+++ b/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)
{
diff --git a/src/stubs/xpstubs.c b/src/stubs/xpstubs.c
index cb5d76d..939b34f 100644
--- a/src/stubs/xpstubs.c
+++ b/src/stubs/xpstubs.c
@@ -3,6 +3,11 @@
#endif
#include "stubs.h"
+#ifdef __SUNPRO_C
+#pragma weak XpClientIsBitmapClient
+#pragma weak XpClientIsPrintClient
+#endif
+
weak Bool
XpClientIsBitmapClient(ClientPtr client)
{
diff --git a/src/util/atom.c b/src/util/atom.c
index e5fea46..b770dc9 100644
--- a/src/util/atom.c
+++ b/src/util/atom.c
@@ -146,6 +146,10 @@ NameEqual (const char *a, const char *b, int l)
return TRUE;
}
+#ifdef __SUNPRO_C
+#pragma weak MakeAtom
+#endif
+
weak Atom
MakeAtom(char *string, unsigned len, int makeit)
{
@@ -219,12 +223,20 @@ MakeAtom(char *string, unsigned len, int makeit)
return a->atom;
}
+#ifdef __SUNPRO_C
+#pragma weak ValidAtom
+#endif
+
weak int
ValidAtom(Atom atom)
{
return (atom != None) && (atom <= lastAtom);
}
+#ifdef __SUNPRO_C
+#pragma weak NameForAtom
+#endif
+
weak char *
NameForAtom(Atom atom)
{
diff --git a/src/util/miscutil.c b/src/util/miscutil.c
index 611f912..43473b7 100644
--- a/src/util/miscutil.c
+++ b/src/util/miscutil.c
@@ -40,8 +40,18 @@ from The Open Group.
#define XK_LATIN1
#include <X11/keysymdef.h>
-/* make sure everything initializes themselves at least once */
+#ifdef __SUNPRO_C
+#pragma weak serverGeneration
+#pragma weak Xalloc
+#pragma weak Xrealloc
+#pragma weak Xfree
+#pragma weak Xcalloc
+#pragma weak CopyISOLatin1Lowered
+#pragma weak register_fpe_functions
+#endif
+
+/* make sure everything initializes themselves at least once */
weak long serverGeneration = 1;
weak void *