aboutsummaryrefslogtreecommitdiff
path: root/libXfont/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-24 12:57:19 +0000
committermarha <marha@users.sourceforge.net>2010-01-24 12:57:19 +0000
commitc30175e5dfc83c42eba93614ce7c084236f348a9 (patch)
tree2e49ffc58ee77d75bb54c98949ab7bc329146b64 /libXfont/src
parent7ee8516a0f5ccb3d6adaa094de9180b5a17fc50c (diff)
downloadvcxsrv-c30175e5dfc83c42eba93614ce7c084236f348a9.tar.gz
vcxsrv-c30175e5dfc83c42eba93614ce7c084236f348a9.tar.bz2
vcxsrv-c30175e5dfc83c42eba93614ce7c084236f348a9.zip
Remap hypot to _hypot.
Make sure the strdup prototype is included.
Diffstat (limited to 'libXfont/src')
-rw-r--r--libXfont/src/FreeType/ftfuncs.c4
-rw-r--r--libXfont/src/bitmap/bitscale.c4
-rw-r--r--libXfont/src/fontfile/fontscale.c4
3 files changed, 12 insertions, 0 deletions
diff --git a/libXfont/src/FreeType/ftfuncs.c b/libXfont/src/FreeType/ftfuncs.c
index 47ebac737..655afa407 100644
--- a/libXfont/src/FreeType/ftfuncs.c
+++ b/libXfont/src/FreeType/ftfuncs.c
@@ -37,6 +37,7 @@ THE SOFTWARE.
#include <string.h>
#include <math.h>
#include <ctype.h>
+#include <unistd.h>
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontutil.h>
@@ -133,6 +134,9 @@ sfnt_get_ushort( FT_Face face,
#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o)))
+#ifdef _MSC_VER
+#define hypot _hypot
+#endif
static int ftypeInitP = 0; /* is the engine initialised? */
FT_Library ftypeLibrary;
diff --git a/libXfont/src/bitmap/bitscale.c b/libXfont/src/bitmap/bitscale.c
index a4d991d3b..1ef21c336 100644
--- a/libXfont/src/bitmap/bitscale.c
+++ b/libXfont/src/bitmap/bitscale.c
@@ -60,6 +60,10 @@ from The Open Group.
#define MAX(a,b) (((a)>(b)) ? a : b)
#endif
+#ifdef _MSC_VER
+#define hypot _hypot
+#endif
+
/* Should get this from elsewhere */
extern unsigned long serverGeneration;
diff --git a/libXfont/src/fontfile/fontscale.c b/libXfont/src/fontfile/fontscale.c
index 8002dde81..cdc43082f 100644
--- a/libXfont/src/fontfile/fontscale.c
+++ b/libXfont/src/fontfile/fontscale.c
@@ -37,6 +37,10 @@ in this Software without prior written authorization from The Open Group.
#include <X11/fonts/fntfilst.h>
#include <math.h>
+#ifdef _MSC_VER
+#define hypot _hypot
+#endif
+
Bool
FontFileAddScaledInstance (FontEntryPtr entry, FontScalablePtr vals,
FontPtr pFont, char *bitmapName)