yn()
A number of C compiler suites have a math.h library that includes a yn() function name that conflicts with NetHack's yn() macro: "The y0(), y1(), and yn() functions are Bessel functions of the second kind, for orders 0, 1, and n, respectively. The argument x must be positive. The argument n should be greater than or equal to zero. If n is less than zero, there will be a negative exponent in the result." At one point, isaac64.h included math.h, although that has since been removed. Some libraries used in NetHack (Qt for one) do include math.h and that required build work-arounds to avoid the conflict. Rename the NetHack macro from yn() to y_n() and avoid the math.h conflict altogether, eliminating the need for that particular work-around.
This commit is contained in:
@@ -887,7 +887,7 @@ doclassdisco(void)
|
||||
but requires at least one artifact discovery for other styles
|
||||
[could fix that by forcing the 'a' choice into the pick-class
|
||||
menu when running in wizard mode] */
|
||||
if (wizard && yn("Dump information about all artifacts?") == 'y') {
|
||||
if (wizard && y_n("Dump information about all artifacts?") == 'y') {
|
||||
dump_artifact_info(tmpwin);
|
||||
ct = NROFARTIFACTS; /* non-zero vs zero is what matters below */
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user