[PATCH] Fix for platforms which don't have weak linkage

[Jon TURNEY]

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 user we might care about
is xfs, which is obsolete...

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 src/stubs/stubs.h   |    1 +
 src/util/miscutil.c |    2 ++
 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)
-- 
1.7.0.4


--------------020103080108080803040005--