nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Qt header usage

Browse Source 
Move the nine #undef's common to all qt_*.cpp sources into qt_pre.h.

Make "hack.h" usage consistent; always enclose withing 'extern "C {'
and '}' even though only some of the sources care.
This commit is contained in:
PatR
2020-08-12 17:01:03 -07:00
parent 0f65db801c
commit 0645f5483d
23 changed files with 57 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/Qt/qt_pre.h
+23
View File
@@ -1,5 +1,28 @@
/* NetHack 3.7 qt_pre.h $NHDT-Date: 1597276835 2020/08/13 00:00:35 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ */
/*
* qt_pre.h -- undefine some nethack macros which conflict with Qt headers.
*
* #include after "hack.h", before <Qt.../Qt...>.
*/
#undef Invisible
#undef Warning
#undef index
#undef msleep
#undef rindex
#undef wizard
#undef yn
#undef min
#undef max
/* disable warnings for shadowed names; some of the Qt prototypes use
placeholder argument names which conflict with nethack variables
('g', 'u', a couple of others) */
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wshadow"
#endif
/*qt_pre.h*/