summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-06-28 17:56:07 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2010-07-08 14:39:52 +0100
commit8f75706901da0141590d46f0f898e5678feac953 (patch)
tree52fb76fc8dd3dfda67c2d79e70820e4606cdfba3 /src
parent5c49c956e9c85d89f6b2e719eb9b6fbde62c2f72 (diff)
Build fix for platforms which don't have weak linkage
Since we fix this by removing the serverGeneration symbol, assuming an external definition will be provided, this means on Windows libXfont can only be built as a static library (since PE shared libraries cannot contain undefined symbols). This produces a libXfont which might only be useful to the xserver, but the only other users we might care about are xfs, which is obsolete, and bdftopcf, which fortunately doesn't pull in any objects which reference serverGeneration from libXfont. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Diffstat (limited to 'src')
-rw-r--r--src/stubs/stubs.h1
-rw-r--r--src/util/miscutil.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h
index 41cde58..7733dc3 100644
--- a/src/stubs/stubs.h
+++ b/src/stubs/stubs.h
@@ -16,6 +16,7 @@
#define weak __attribute__((weak))
#else
#define weak
+#define NO_WEAK_SYMBOLS
#endif
extern FontPtr find_old_font ( FSID id );
diff --git a/src/util/miscutil.c b/src/util/miscutil.c
index 1e76b4b..cb43666 100644
--- a/src/util/miscutil.c
+++ b/src/util/miscutil.c
@@ -48,8 +48,10 @@ from The Open Group.
extern void BuiltinRegisterFpeFunctions(void);
+#ifndef NO_WEAK_SYMBOLS
/* make sure everything initializes themselves at least once */
weak long serverGeneration = 1;
+#endif
weak void
register_fpe_functions (void)