summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2007-04-02 17:40:19 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2007-04-02 17:40:19 -0700
commit0fbb37ccc630ced42d6a973c81d947870cca7637 (patch)
treed4fc36c9f0e52780b67b0739588b0dc62d76f1e1 /src/util
parentcc824e4f2c9a53a00b36a6f83bf065c363027087 (diff)
Add #pragma weak for Sun cc where needed
Diffstat (limited to 'src/util')
-rw-r--r--src/util/atom.c12
-rw-r--r--src/util/miscutil.c12
2 files changed, 23 insertions, 1 deletions
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 *