diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
commit | ddfb922180a6a847d52609592a2bdb37179ca439 (patch) | |
tree | 7cc662bfb9ffb45c4c4452ea373e3c1a843b395a /libXfont/src/util/fontxlfd.c | |
parent | 02934f83dd4f5848083e2e5cdbc6ef7f60361f06 (diff) | |
parent | 2fb179f86b0f9ecb7876759b87f9c64634a3f114 (diff) | |
download | vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.gz vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.bz2 vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Gives currently link errors. xorg-server needs to be upgraded to.
Diffstat (limited to 'libXfont/src/util/fontxlfd.c')
-rw-r--r-- | libXfont/src/util/fontxlfd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libXfont/src/util/fontxlfd.c b/libXfont/src/util/fontxlfd.c index f402aa9dd..664d7598f 100644 --- a/libXfont/src/util/fontxlfd.c +++ b/libXfont/src/util/fontxlfd.c @@ -203,7 +203,6 @@ xlfd_round_double(double x) defined(__hppa__) || \ defined(__amd64__) || defined(__amd64) || \ defined(sgi) -#if !defined(__UNIXOS2__) /* if we have IEEE 754 fp, we can round to binary digits... */ @@ -263,7 +262,6 @@ xlfd_round_double(double x) } else #endif -#endif /* !__UNIXOS2__ */ #endif /* i386 || __i386__ */ { /* |