diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2018-01-20 17:46:12 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2018-01-20 17:46:12 +0000 |
commit | 1c266da5ed065dcc73e25206c740a899d3e2d50c (patch) | |
tree | 650e3380c2325656c2803060285a691f99cafe90 /games/avanor | |
parent | fa88a534349af0174e882aa70b0fe267f1ad0092 (diff) |
Notes
Diffstat (limited to 'games/avanor')
-rw-r--r-- | games/avanor/files/patch-creature__Uniquem.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/games/avanor/files/patch-creature__Uniquem.cpp b/games/avanor/files/patch-creature__Uniquem.cpp new file mode 100644 index 000000000000..bc35b2c62c80 --- /dev/null +++ b/games/avanor/files/patch-creature__Uniquem.cpp @@ -0,0 +1,19 @@ +creature/Uniquem.cpp:628:11: error: cannot initialize return object of type 'int' with an rvalue of + type 'nullptr_t' + return NULL; + ^~~~ +/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' +#define NULL nullptr + ^~~~~~~ + +--- creature/Uniquem.cpp.orig 2003-12-10 07:03:57 UTC ++++ creature/Uniquem.cpp +@@ -625,7 +625,7 @@ int XYohjishiro::onGiveItem(XCreature * giver, XItem * + (*it)->Item()->Identify(1); + + } +- return NULL; ++ return 0; + } else + { + char tbuf[256]; |