From e91e4601a08bd7d1f1f29818398b2b0f10d3cfaa Mon Sep 17 00:00:00 2001 From: velnias75 Date: Thu, 21 May 2015 12:00:34 +0200 Subject: [PATCH] header cleanup with Eric S. Raymond's deheader --- configure.ac | 21 +++++++++---------- src/ai/abstractaction.cpp | 5 +---- src/ai/abstractcondition.cpp | 2 +- src/ai/checkjacksuitaction.cpp | 1 + src/ai/decisionbase.cpp | 2 +- src/ai/havejackcondition.cpp | 2 -- src/ai/jacksuitaction.cpp | 1 - src/ai/maxsuitaction.cpp | 4 ++-- src/ai/powerplayaction.cpp | 1 - src/ai/randomjackaction.cpp | 2 -- src/client/abstractclient.cpp | 7 +++++-- src/client/abstractclientv05impl.cpp | 3 --- src/client/clientconnection.cpp | 10 ++++++---- src/client/clientconnectionimpl.cpp | 6 ++++-- src/common/abstractconnection.cpp | 3 --- src/common/abstractsocket.cpp | 10 +++++++--- src/common/base64.cpp | 3 --- src/common/cardtools.cpp | 4 ++++ src/common/logger.cpp | 1 + src/engine/abstractplayer.cpp | 2 +- src/engine/easyplayer.cpp | 12 +++++------ src/engine/engine.cpp | 14 +++++++------ src/engine/talon.cpp | 2 +- src/lua/luaruleset.cpp | 1 - src/lua/luastate.cpp | 1 - src/server/game.cpp | 5 ++--- src/server/helpers.cpp | 8 ++++---- src/server/main.cpp | 30 +++++++++++++++++++++------- src/server/servereventhandler.cpp | 7 +++++-- src/server/serverplayer.cpp | 5 ++++- src/server/ttynamecheckdir.cpp | 16 ++++++++++++--- src/test/test_client.cpp | 3 +-- src/test/test_netmaumau.cpp | 4 +--- src/test/testclient.cpp | 1 - 34 files changed, 113 insertions(+), 86 deletions(-) diff --git a/configure.ac b/configure.ac index fadde0e..877b479 100644 --- a/configure.ac +++ b/configure.ac @@ -48,8 +48,8 @@ AC_ARG_ENABLE([ai-image], [AS_HELP_STRING([--enable-ai-image], [path to image of [ AM_CONDITIONAL([BRANDING], [ test x$enable_ai_image != xno ]) ], [ AM_CONDITIONAL([BRANDING], [ false ]) ]) -AC_ARG_ENABLE([ai-tracing], [AS_HELP_STRING([--enable-ai-tracing], - [enables tracing of AI decisions (useful for developers only, needs NDEBUG undefined)])], +AC_ARG_ENABLE([ai-tracing], [AS_HELP_STRING([--enable-ai-tracing], + [enables tracing of AI decisions (useful for developers only, needs NDEBUG undefined)])], [ if test x$enable_ai_tracing = xyes; then AC_DEFINE([TRACE_AI], [1], [Define to 1 to enable tracing of AI decisions]) fi @@ -92,7 +92,7 @@ fi if test -z "$ac_cv_prog_CPPCHECK"; then AM_CONDITIONAL([CHECKCPP], [ false ]) -else +else AM_CONDITIONAL([CHECKCPP], [ true ]) fi @@ -111,7 +111,7 @@ PKG_CHECK_MODULES([POPT], [popt >= 1.10]) AC_CHECK_LIB([magic], [magic_open]) AC_CHECK_LIB([rt], [timer_create]) PKG_CHECK_MODULES([GSL], [gsl >= 1.9], - [ AM_CONDITIONAL([GSL], [ true ]) + [ AM_CONDITIONAL([GSL], [ true ]) echo "[[ENVIRONMENT]] .TP \fBGSL_RNG_TYPE\fR @@ -122,15 +122,16 @@ the desired seed value .PP See the .mso www.tmac -.URL \"http://www.gnu.org/software/gsl/manual/html_node/Random-number-environment-variables.html\" \"GSL Manual\" \" for more information\"" > gsl.h2m ], +.URL \"http://www.gnu.org/software/gsl/manual/html_node/Random-number-environment-variables.html\" \"GSL Manual\" \" for more information\"" > gsl.h2m ], [ AM_CONDITIONAL([GSL], [ false ])] ) PKG_CHECK_MODULES([LIBSQLITE], [sqlite3 >= 3.4.2]) -PKG_CHECK_MODULES([LIBLUA], [lua5.1 >= 5.1.2], [ AC_SUBST([PKGC_LUA], [lua5.1]) ], +PKG_CHECK_MODULES([LIBLUA], [lua5.1 >= 5.1.2], [ AC_SUBST([PKGC_LUA], [lua5.1]) ], [ PKG_CHECK_MODULES([LIBLUA], [lua51 >= 5.1.2], [ AC_SUBST([PKGC_LUA], [lua51]) ], [ PKG_CHECK_MODULES([LIBLUA], [lua >= 5.1.2 lua < 5.2], [AC_SUBST([PKGC_LUA], [lua])] ) ] ) ]) # Checks for header files. AC_HEADER_STDBOOL +AC_CHECK_HEADERS([sys/wait.h]) AC_CHECK_HEADERS([sys/time.h]) AC_CHECK_HEADERS([magic.h]) AC_CHECK_HEADERS([poll.h]) @@ -164,8 +165,8 @@ AC_CHECK_FUNCS([socket]) AC_CHECK_FUNCS([select]) AC_CHECK_FUNCS([atexit]) AC_CHECK_FUNCS([strerror]) -AC_CHECK_FUNC([arc4random_uniform], - [ AC_DEFINE([HAVE_ARC4RANDOM_UNIFORM], [1], [we have arc4random_uniform]) +AC_CHECK_FUNC([arc4random_uniform], + [ AC_DEFINE([HAVE_ARC4RANDOM_UNIFORM], [1], [we have arc4random_uniform]) ]) AC_FUNC_ERROR_AT_LINE AC_FUNC_CHOWN @@ -193,7 +194,7 @@ CFLAGS="${CFLAGS} -std=gnu99 -fvisibility-inlines-hidden" CXXFLAGS="${CXXFLAGS} -std=gnu++98 -fvisibility=${VISIBILITY} -fvisibility-inlines-hidden -fstrict-aliasing" CPPFLAGS="${CPPFLAGS} -DBASICLOGGER_NO_PTHREADS -D_GLIBCXX_VISIBILITY=0" NO_EXCEPTIONS="-fno-exceptions" ; - + if test x$CLANG = xyes; then CXXFLAGS="-fexceptions -frtti ${CXXFLAGS}" ; fi AC_SUBST([LDFLAGS]) @@ -209,5 +210,5 @@ AC_CONFIG_FILES([src/server/netmaumau.rc doc/client.dox netmaumau.h2m]) AC_MSG_RESULT([You may want to install a client too: https://github.com/velnias75/NetMauMau-Qt-Client]) AC_OUTPUT([Makefile doc/Makefile src/Makefile src/ai/Makefile src/client/Makefile - src/common/Makefile src/engine/Makefile src/images/Makefile src/include/Makefile + src/common/Makefile src/engine/Makefile src/images/Makefile src/include/Makefile src/lua/Makefile src/server/Makefile src/sqlite/Makefile src/test/Makefile]) diff --git a/src/ai/abstractaction.cpp b/src/ai/abstractaction.cpp index ed6930b..7dedd69 100644 --- a/src/ai/abstractaction.cpp +++ b/src/ai/abstractaction.cpp @@ -19,10 +19,7 @@ #include "abstractaction.h" -#include // for size_t #include // for memset -#include // for binder2nd, etc -#include // for distance #include "cardtools.h" // for findSuit, isRank, isSuit @@ -69,7 +66,7 @@ AbstractAction::~AbstractAction() {} const IConditionPtr &AbstractAction::operator()(IAIState &state) const { #if defined(TRACE_AI) && !defined(NDEBUG) - if(!getenv("NMM_NO_TRACE")) logDebug("-> " << traceLog()); + if(!std::getenv("NMM_NO_TRACE")) logDebug("-> " << traceLog()); #endif diff --git a/src/ai/abstractcondition.cpp b/src/ai/abstractcondition.cpp index 45b34ad..b8f2f1c 100644 --- a/src/ai/abstractcondition.cpp +++ b/src/ai/abstractcondition.cpp @@ -47,7 +47,7 @@ IActionPtr AbstractCondition::operator()(const IAIState &state) const { #if defined(TRACE_AI) && !defined(NDEBUG) - if(!getenv("NMM_NO_TRACE")) logDebug(" * " << traceLog()); + if(!std::getenv("NMM_NO_TRACE")) logDebug(" * " << traceLog()); #endif diff --git a/src/ai/checkjacksuitaction.cpp b/src/ai/checkjacksuitaction.cpp index e9e43c6..a251afb 100644 --- a/src/ai/checkjacksuitaction.cpp +++ b/src/ai/checkjacksuitaction.cpp @@ -21,6 +21,7 @@ #include // for find_if #include // for assert +#include #include "random_gen.h" // for genRandom #include "stdcardfactory.h" // for StdCardFactory diff --git a/src/ai/decisionbase.cpp b/src/ai/decisionbase.cpp index 335ad29..35080cf 100644 --- a/src/ai/decisionbase.cpp +++ b/src/ai/decisionbase.cpp @@ -18,7 +18,7 @@ */ #include "decisionbase.h" -#include // for pointer_to_binary_function, etc + #include "cardtools.h" // for isRank, isSuit namespace { diff --git a/src/ai/havejackcondition.cpp b/src/ai/havejackcondition.cpp index ce566bc..0549f29 100644 --- a/src/ai/havejackcondition.cpp +++ b/src/ai/havejackcondition.cpp @@ -19,8 +19,6 @@ #include "havejackcondition.h" -#include - #include "bestjackaction.h" // for BestJackAction #include "cardtools.h" // for findRank #include "havelessthancondition.h" // for HaveLessThanCondition diff --git a/src/ai/jacksuitaction.cpp b/src/ai/jacksuitaction.cpp index daa23b3..f4c4415 100644 --- a/src/ai/jacksuitaction.cpp +++ b/src/ai/jacksuitaction.cpp @@ -20,7 +20,6 @@ #include "jacksuitaction.h" #include // for assert -#include // for pointer_to_binary_function, etc #include "bestjackaction.h" // for BestJackAction #include "cardtools.h" // for isRank diff --git a/src/ai/maxsuitaction.cpp b/src/ai/maxsuitaction.cpp index 156ce13..304926b 100644 --- a/src/ai/maxsuitaction.cpp +++ b/src/ai/maxsuitaction.cpp @@ -18,9 +18,9 @@ */ #include "maxsuitaction.h" + #include // for assert -#include // for size_t -#include + #include "aceroundcondition.h" // for AceRoundCondition #include "cardtools.h" // for findRank, findSuit #include "iruleset.h" // for IRuleSet diff --git a/src/ai/powerplayaction.cpp b/src/ai/powerplayaction.cpp index 8994318..2bb2cd4 100644 --- a/src/ai/powerplayaction.cpp +++ b/src/ai/powerplayaction.cpp @@ -20,7 +20,6 @@ #include "powerplayaction.h" #include // for assert -#include // for distance #include "aceroundcondition.h" // for AceRoundCondition #include "cardtools.h" // for findSuit diff --git a/src/ai/randomjackaction.cpp b/src/ai/randomjackaction.cpp index d075b24..cf4290a 100644 --- a/src/ai/randomjackaction.cpp +++ b/src/ai/randomjackaction.cpp @@ -19,8 +19,6 @@ #include "randomjackaction.h" -#include // for reverse_iterator - #include "cardtools.h" // for findSuit #include "random_gen.h" // for genRandom diff --git a/src/client/abstractclient.cpp b/src/client/abstractclient.cpp index 4ae105f..1c01671 100644 --- a/src/client/abstractclient.cpp +++ b/src/client/abstractclient.cpp @@ -19,8 +19,11 @@ #include // for assert #include // for NULL, snprintf -#include // for pointer_to_binary_function, etc -#include // for back_insert_iterator, etc +#include + +#ifdef HAVE_SYS_SOCKET_H +#include +#endif #include "abstractclientv05impl.h" // for AbstractClientV05Impl #include "logger.h" // for BasicLogger, logDebug diff --git a/src/client/abstractclientv05impl.cpp b/src/client/abstractclientv05impl.cpp index d628a97..f463394 100644 --- a/src/client/abstractclientv05impl.cpp +++ b/src/client/abstractclientv05impl.cpp @@ -21,9 +21,6 @@ #include // for find_if #include // for memcpy -#include // for binder2nd, bind2nd, etc -#include // for advance -#include // for nothrow, operator new[] #if defined(_WIN32) #undef TRUE diff --git a/src/client/clientconnection.cpp b/src/client/clientconnection.cpp index 18b3c88..80c777b 100644 --- a/src/client/clientconnection.cpp +++ b/src/client/clientconnection.cpp @@ -23,9 +23,11 @@ #include // for NULL, strtoll, strtoul #include // for strncmp, memcpy -#include // for nothrow, operator new[] #include // for operator<<, ostringstream, etc -#include // for make_pair, pair + +#ifdef HAVE_SYS_SOCKET_H +#include +#endif #include "abstractclient.h" // for AbstractClient #include "base64bridge.h" // for Base64Bridge @@ -268,9 +270,9 @@ throw(NetMauMau::Common::Exception::SocketException) { char name[4] = { 0 }; recv(name, 4, getSocketFD()); - if(!strncmp(name, "NAME", 4)) { + if(!std::strncmp(name, "NAME", 4)) { send(_pimpl->m_pName.c_str(), _pimpl->m_pName.length(), getSocketFD()); - } else if(!strncmp(name, "NAMP", 4)) { + } else if(!std::strncmp(name, "NAMP", 4)) { if(!(data && len)) { send(_pimpl->m_pName.c_str(), _pimpl->m_pName.length(), getSocketFD()); diff --git a/src/client/clientconnectionimpl.cpp b/src/client/clientconnectionimpl.cpp index f3ec52e..43ef522 100644 --- a/src/client/clientconnectionimpl.cpp +++ b/src/client/clientconnectionimpl.cpp @@ -23,12 +23,14 @@ #include "clientconnectionimpl.h" -#include // for NULL - #ifndef _WIN32 #include // for select, FD_SET, FD_ZERO, etc #endif +#ifdef HAVE_UNISTD_H +#include +#endif + #include // for timeval #include // for errno, EINTR diff --git a/src/common/abstractconnection.cpp b/src/common/abstractconnection.cpp index 0fdb16e..489f931 100644 --- a/src/common/abstractconnection.cpp +++ b/src/common/abstractconnection.cpp @@ -21,8 +21,6 @@ #include "config.h" // for HAVE_UNISTD_H, PACKAGE_NAME #endif -#include // for strtoul - #ifndef _WIN32 #include // for select, FD_SET, FD_ZERO, etc #endif @@ -36,7 +34,6 @@ #include // for find_if, find, for_each #include // for errno #include // for NULL, strlen -#include // for binder2nd, bind2nd, etc #include "abstractconnectionimpl.h" // for AbstractConnectionImpl #include "errorstring.h" // for errorString diff --git a/src/common/abstractsocket.cpp b/src/common/abstractsocket.cpp index 61c844e..73fb57e 100644 --- a/src/common/abstractsocket.cpp +++ b/src/common/abstractsocket.cpp @@ -29,17 +29,21 @@ #include // for FD_ISSET, FD_SET, select, etc #endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif + +#include + #ifdef HAVE_UNISTD_H #include // for close, socklen_t, ssize_t #endif -#include // for max #include // for errno, ENOMEM -#include // for size_t #include // for NULL, fileno, snprintf, etc #include // for memset -#include // for bad_alloc #include // for vector +#include #include "abstractsocket.h" // for AbstractSocket #include "abstractsocketimpl.h" // for AbstractSocketImpl diff --git a/src/common/base64.cpp b/src/common/base64.cpp index 7a41f46..310c4a5 100644 --- a/src/common/base64.cpp +++ b/src/common/base64.cpp @@ -19,9 +19,6 @@ #include "base64.h" -#include // for isalnum -#include // for bad_alloc - #include "logger.h" // for logDebug static const std::string base64_chars = diff --git a/src/common/cardtools.cpp b/src/common/cardtools.cpp index bad94a2..bcb3507 100644 --- a/src/common/cardtools.cpp +++ b/src/common/cardtools.cpp @@ -17,6 +17,10 @@ * along with NetMauMau. If not, see . */ +#if defined(HAVE_CONFIG_H) || defined(IN_IDE_PARSER) +#include "config.h" +#endif + #include "cardtools.h" // IWYU pragma: keep #include // for isdigit diff --git a/src/common/logger.cpp b/src/common/logger.cpp index 1c2ef89..d24b496 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -23,6 +23,7 @@ #include "logger.h" #include // for ostreambuf_iterator, cerr +#include #ifdef HAVE_SYSLOG_H #undef LOG_DEBUG diff --git a/src/engine/abstractplayer.cpp b/src/engine/abstractplayer.cpp index 424432c..7927cf7 100644 --- a/src/engine/abstractplayer.cpp +++ b/src/engine/abstractplayer.cpp @@ -19,8 +19,8 @@ #include "abstractplayer.h" -#include // for pointer_to_binary_function, etc #include // for accumulate +#include #include "cardtools.h" // for cardEqual, isRank #include "icardcountobserver.h" // for ICardCountObserver diff --git a/src/engine/easyplayer.cpp b/src/engine/easyplayer.cpp index fb7fd2e..34ae447 100644 --- a/src/engine/easyplayer.cpp +++ b/src/engine/easyplayer.cpp @@ -21,11 +21,11 @@ #include "config.h" // IWYU pragma: keep #endif -#include "easyplayer.h" +#include -#include // for time +#include "easyplayer.h" -#include "cardtools.h" // for findCard, getIllegalCard, etc +#include "cardtools.h" #include "random_gen.h" // for genRandom using namespace NetMauMau::Player; @@ -66,9 +66,9 @@ EasyPlayer::requestCard(const NetMauMau::Common::ICardPtr &uncoveredCard, const bool ansi = isatty(fileno(stderr)); - if(!getenv("NMM_NO_TRACE")) logDebug("-> trace of AI \"" << getName() << "\" -> " - << (rrc ? rrc->description(ansi) : "NO CARD") - << " <-"); + if(!std::getenv("NMM_NO_TRACE")) logDebug("-> trace of AI \"" << getName() << "\" -> " + << (rrc ? rrc->description(ansi) : "NO CARD") + << " <-"); #endif diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index d4e5ff9..d55cf61 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -18,7 +18,7 @@ */ #if defined(HAVE_CONFIG_H) || defined(IN_IDE_PARSER) -#include "config.h" // for HAVE_SYS_SOCKET_H, etc +#include "config.h" // for HAVE_SYS_SOCKET_H, etc #endif #ifdef _WIN32 @@ -27,6 +27,8 @@ #define SHUT_RDWR SD_BOTH #endif #elif defined(HAVE_SYS_SOCKET_H) +#include +#include #include // for shutdown, SHUT_RDWR #endif @@ -34,16 +36,16 @@ #include // for GSLRNG #endif -#include // for tolower - #ifdef HAVE_UNISTD_H #include // for close #endif #include // for assert -#include // for binder2nd, mem_fun1_t, etc -#include // for advance, distance -#include // for size_t, operator<<, etc +#include + +#ifdef HAVE_SYS_WAIT_H +#include +#endif #include "logger.h" // for logDebug, BasicLogger #include "cardtools.h" // for getIllegalCard diff --git a/src/engine/talon.cpp b/src/engine/talon.cpp index 2f82d79..deda1cf 100644 --- a/src/engine/talon.cpp +++ b/src/engine/talon.cpp @@ -21,7 +21,7 @@ #include // for random_shuffle, for_each #include // for assert -#include // for unary_function, etc +#include #include "italonchange.h" // for ITalonChange #include "random_gen.h" // for genRandom diff --git a/src/lua/luaruleset.cpp b/src/lua/luaruleset.cpp index a81ea36..b1151a9 100644 --- a/src/lua/luaruleset.cpp +++ b/src/lua/luaruleset.cpp @@ -20,7 +20,6 @@ #include "luaruleset.h" #include // for max, copy, for_each -#include // for unary_function, etc #include // for ostream_iterator #include // for numeric_limits diff --git a/src/lua/luastate.cpp b/src/lua/luastate.cpp index 3d96352..4b2d19e 100644 --- a/src/lua/luastate.cpp +++ b/src/lua/luastate.cpp @@ -25,7 +25,6 @@ extern "C" { } #include // for strncmp -#include // for operator new #include "logger.h" // for logInfo #include "cardtools.h" // for getSuitSymbols, etc diff --git a/src/server/game.cpp b/src/server/game.cpp index b012d66..2eefbb4 100644 --- a/src/server/game.cpp +++ b/src/server/game.cpp @@ -19,15 +19,14 @@ #include "game.h" -#include // for max -#include // for snprintf +#include #include "abstractsocket.h" // for AbstractSocket #include "easyplayer.h" // for EasyPlayer #include "gameconfig.h" // for GameConfig #include "ieventhandler.h" // for IEventHandler -#include "luafatalexception.h" // for LuaFatalException #include "logger.h" +#include "luafatalexception.h" // for LuaFatalException #include "sqlite.h" // for SQLite namespace { diff --git a/src/server/helpers.cpp b/src/server/helpers.cpp index 1693f9b..428261a 100644 --- a/src/server/helpers.cpp +++ b/src/server/helpers.cpp @@ -35,18 +35,18 @@ #include // for getnameinfo, NI_NUMERICHOST #endif -#include // for free - #ifdef HAVE_UNISTD_H #include // for getuid, setegid, seteuid #endif #include // for errno #include // for PATH_MAX -#include // for snprintf, NULL, fclose, etc #include // for strerror, strcmp, strlen, etc #include // for operator<<, basic_ostream, etc #include // for set, etc +#include +#include +#include #include "game.h" // for TIMEFORMAT, Game #include "logger.h" // for Logger @@ -163,7 +163,7 @@ void sh_dump(int, siginfo_t *info, void *) { if(std::fscanf(spf, "%d %ms %c %d %d %d %d", &iDummy, &sDummy, &cDummy, &iDummy, &iDummy, &iDummy, &tty_nr)) {} - free(sDummy); + std::free(sDummy); #else char sDevice[20], sCmd[256]; diff --git a/src/server/main.cpp b/src/server/main.cpp index e0d5e8b..92fdd8f 100644 --- a/src/server/main.cpp +++ b/src/server/main.cpp @@ -32,24 +32,40 @@ #define AUML "\u00e4" #endif -#include // for toupper #include // for poptFreeContext, etc -#include // for sigaction, sigevent, etc -#include // for CLOCK_REALTIME, timeval +#include // for sigaction, sigevent, etc #include // for max, min, count_if #include // IWYU pragma: keep -#include // for NULL, snprintf #include // for memset -#include // IWYU pragma: keep +#include // for snprintf +#include +#include #include // for operator<<, ostringstream, etc -#include // for make_pair +#include + +#ifdef PIDFILE +#include +#endif + +#ifdef HAVE_UNISTD_H +#include +#endif + +#include + +#ifdef HAVE_SYS_SOCKET_H +#include +#endif + +#ifdef HAVE_SYS_WAIT_H +#include +#endif #include "logger.h" // for BasicLogger, logger, etc #include "game.h" // for Game, etc #include "gameconfig.h" // for GameConfig #include "helpers.h" // for arRank, minPlayers, decks, etc #include "luaexception.h" // for LuaException -#include "serverconnection.h" // for Connection, etc #include "servereventhandler.h" // for EventHandler #include "serverplayer.h" // for Player #include "sqlite.h" // for SQLite diff --git a/src/server/servereventhandler.cpp b/src/server/servereventhandler.cpp index dc4ef17..d0e112a 100644 --- a/src/server/servereventhandler.cpp +++ b/src/server/servereventhandler.cpp @@ -20,8 +20,11 @@ #include "servereventhandler.h" #include // for snprintf -#include // for ostringstream, etc -#include // for make_pair +#include + +#ifdef HAVE_UNISTD_H +#include +#endif #include "logger.h" // for BasicLogger, logError #include "cardtools.h" // for suitToSymbol diff --git a/src/server/serverplayer.cpp b/src/server/serverplayer.cpp index 771311e..88a5773 100644 --- a/src/server/serverplayer.cpp +++ b/src/server/serverplayer.cpp @@ -19,9 +19,12 @@ #include "serverplayer.h" -#include // for strtoul #include // for snprintf, NULL +#ifdef HAVE_UNISTD_H +#include +#endif + #include "cardtools.h" // for getIllegalCard, etc #include "serverconnection.h" // for Connection #include "serverplayerexception.h" // for ServerPlayerException diff --git a/src/server/ttynamecheckdir.cpp b/src/server/ttynamecheckdir.cpp index 1426e6b..73bc2bf 100644 --- a/src/server/ttynamecheckdir.cpp +++ b/src/server/ttynamecheckdir.cpp @@ -19,16 +19,26 @@ * Based upon: http://man7.org/tlpi/code/online/book/tty/ttyname.c.html */ +#if defined(HAVE_CONFIG_H) || defined(IN_IDE_PARSER) +#include "config.h" +#endif + #ifndef _WIN32 #include "ttynamecheckdir.h" #include // for closedir, dirent, opendir, etc -#include // for stat, S_ISCHR #include // for size_t #include // for NULL, snprintf #include // for malloc, realloc #include // for strlen +#include +#include // for stat, S_ISCHR +#include + +#ifdef HAVE_UNISTD_H +#include +#endif char *NetMauMau::Server::ttynameCheckDir(dev_t ttyNr, const char *devDir) { @@ -39,7 +49,7 @@ char *NetMauMau::Server::ttynameCheckDir(dev_t ttyNr, const char *devDir) { if(ttyLen == 0) { - ttyPath = static_cast(malloc(50)); + ttyPath = static_cast(std::malloc(50)); if(!ttyPath) return NULL; @@ -59,7 +69,7 @@ char *NetMauMau::Server::ttynameCheckDir(dev_t ttyNr, const char *devDir) { if(requiredLen > ttyLen) { - char *nTtyPath = static_cast(realloc(ttyPath, requiredLen)); + char *nTtyPath = static_cast(std::realloc(ttyPath, requiredLen)); if(nTtyPath) { ttyPath = nTtyPath; diff --git a/src/test/test_client.cpp b/src/test/test_client.cpp index c2b8f2c..599e082 100644 --- a/src/test/test_client.cpp +++ b/src/test/test_client.cpp @@ -18,12 +18,11 @@ */ #include // for POPT_ARG_VAL, poptBadOption, etc -#include // for timeval #include // for NULL, EXIT_FAILURE, etc #include // for operator<<, setw #include // for basic_ostream, operator<<, etc #include // IWYU pragma: keep -#include // for pair +#include #include "testclient.h" // for TestClient #include "testimg.h" // for test_client_img diff --git a/src/test/test_netmaumau.cpp b/src/test/test_netmaumau.cpp index 9a03949..1618712 100644 --- a/src/test/test_netmaumau.cpp +++ b/src/test/test_netmaumau.cpp @@ -21,10 +21,8 @@ #include "config.h" #endif -#include - -#include "logger.h" #include "hardplayer.h" +#include "logger.h" #include "testeventhandler.h" using namespace NetMauMau; diff --git a/src/test/testclient.cpp b/src/test/testclient.cpp index 26de333..79c69ae 100644 --- a/src/test/testclient.cpp +++ b/src/test/testclient.cpp @@ -19,7 +19,6 @@ #include "testclient.h" -#include // for pointer_to_binary_function, etc #include // for operator<<, setw #include // for basic_ostream, operator<<, etc