diff options
author | marha <marha@users.sourceforge.net> | 2010-01-24 12:41:38 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-01-24 12:41:38 +0000 |
commit | 974379a8cbc18be08eec987bfcf09dc132d31223 (patch) | |
tree | e8ea69f954a402e4d597fb112a9bc26cbb2fac69 | |
parent | 439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9 (diff) | |
download | vcxsrv-974379a8cbc18be08eec987bfcf09dc132d31223.tar.gz vcxsrv-974379a8cbc18be08eec987bfcf09dc132d31223.tar.bz2 vcxsrv-974379a8cbc18be08eec987bfcf09dc132d31223.zip |
The visual studio compiler does not define a prototype for hypot but for _hypot. This caused wrong plotting of lines in octave. (Problem reported by nkmho )
-rw-r--r-- | xorg-server/mi/miarc.c | 4 | ||||
-rw-r--r-- | xorg-server/mi/miwideline.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/xorg-server/mi/miarc.c b/xorg-server/mi/miarc.c index 5fd1a678a..4a4a05dc0 100644 --- a/xorg-server/mi/miarc.c +++ b/xorg-server/mi/miarc.c @@ -64,6 +64,10 @@ SOFTWARE. #include "mifillarc.h" #include <X11/Xfuncproto.h> +#ifdef _MSC_VER +#define hypot _hypot +#endif + static double miDsin(double a); static double miDcos(double a); static double miDasin(double v); diff --git a/xorg-server/mi/miwideline.c b/xorg-server/mi/miwideline.c index 210a6251e..838b06c68 100644 --- a/xorg-server/mi/miwideline.c +++ b/xorg-server/mi/miwideline.c @@ -45,6 +45,10 @@ from The Open Group. #include <math.h> #undef _XOPEN_SOURCE #endif +#ifdef _MSC_VER +#define hypot _hypot +#endif + #include <X11/X.h> #include "windowstr.h" #include "gcstruct.h" |