diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-11-06 21:51:43 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-06 21:56:19 +0100 |
| commit | dde0770def9750cdda6cb204bd1354c543a68e0c (patch) | |
| tree | d03c79d3ad527e656873d2faf9a68388ae6a3982 | |
| parent | 8e818e928f85a06f7f6c91c2baedab97a32e0f12 (diff) | |
| download | crawl-ref-dde0770def9750cdda6cb204bd1354c543a68e0c.tar.gz crawl-ref-dde0770def9750cdda6cb204bd1354c543a68e0c.zip | |
Put DJGPP's round() into a #define so other builds don't suffer.
| -rw-r--r-- | crawl-ref/source/AppHdr.h | 3 | ||||
| -rw-r--r-- | crawl-ref/source/ray.cc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index fcaa373b09..a911f883c8 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -199,6 +199,9 @@ #include <dos.h> + // It's sad we don't use autoconf... + #define round(x) floor((x)+0.5) + // Use Perl-compatible regular expressions. libpcre must be available and // linked in. This is optional. #ifndef REGEX_PCRE diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc index 2b7c091085..f2b8c067ef 100644 --- a/crawl-ref/source/ray.cc +++ b/crawl-ref/source/ray.cc @@ -29,7 +29,7 @@ static int _ifloor(double d) static int iround(double d) { - return static_cast<int>(floor(d+0.5)); + return static_cast<int>(round(d)); } static int ifloor(double d) @@ -43,7 +43,7 @@ static int ifloor(double d) static bool double_is_integral(double d) { - return (double_is_zero(d - floor(d+0.5))); + return (double_is_zero(d - round(d))); } // Is v in the interiour of a diamond? |