diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-25 08:09:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-25 08:09:35 +0000 |
| commit | 33ffba2e91f46fed9e98d82d3db52b443fb49d9b (patch) | |
| tree | 03db1d562b43892e14b1cd00233669ad3ce82fa7 /libXfont/src/util/miscutil.c | |
| parent | 345335d61c71c245846d679d568a8b5eca1a5ca9 (diff) | |
| parent | 65fee5533a4cec1d9c1ec631f9cb98f09cf638cf (diff) | |
| download | vcxsrv-33ffba2e91f46fed9e98d82d3db52b443fb49d9b.tar.gz vcxsrv-33ffba2e91f46fed9e98d82d3db52b443fb49d9b.tar.bz2 vcxsrv-33ffba2e91f46fed9e98d82d3db52b443fb49d9b.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'libXfont/src/util/miscutil.c')
| -rw-r--r-- | libXfont/src/util/miscutil.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libXfont/src/util/miscutil.c b/libXfont/src/util/miscutil.c index 345927515..d87f9a0c1 100644 --- a/libXfont/src/util/miscutil.c +++ b/libXfont/src/util/miscutil.c @@ -46,10 +46,19 @@ from The Open Group. #pragma weak register_fpe_functions #endif +extern void BuiltinRegisterFpeFunctions(void); + +#ifndef _MSC_VER /* make sure everything initializes themselves at least once */ weak long serverGeneration = 1; +#endif weak void register_fpe_functions (void) { + BuiltinRegisterFpeFunctions(); + FontFileRegisterFpeFunctions(); +#ifdef XFONT_FC + fs_register_fpe_functions(); +#endif } |