summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-08 01:44:20 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-08 01:44:20 +0300
commit69a1bbcd0c2170975556bfe495e1f169fd6c7726 (patch)
tree2edca171b40bbbb421f7eaaf857ed79e794730c1
parent34a83475636164cf43551d9ec83ec30da5a7e7f2 (diff)
downloadmanaverse-69a1bbcd0c2170975556bfe495e1f169fd6c7726.tar.gz
manaverse-69a1bbcd0c2170975556bfe495e1f169fd6c7726.tar.bz2
manaverse-69a1bbcd0c2170975556bfe495e1f169fd6c7726.tar.xz
manaverse-69a1bbcd0c2170975556bfe495e1f169fd6c7726.zip
Replace depricated headers.
-rw-r--r--src/const/net/nostat.h2
-rw-r--r--src/fs/virtfs/fsdir.cpp2
-rw-r--r--src/resources/wallpaper.cpp2
-rw-r--r--src/sdl2gfx/SDL2_rotozoom.h2
-rw-r--r--src/utils/env.cpp2
-rw-r--r--src/utils/process.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/const/net/nostat.h b/src/const/net/nostat.h
index 6b41a615d..721db244c 100644
--- a/src/const/net/nostat.h
+++ b/src/const/net/nostat.h
@@ -21,7 +21,7 @@
#ifndef CONST_NET_NOSTAT_H
#define CONST_NET_NOSTAT_H
-#include <limits.h>
+#include <climits>
static const int NoStat = INT_MAX;
diff --git a/src/fs/virtfs/fsdir.cpp b/src/fs/virtfs/fsdir.cpp
index bc73771e7..37111fc45 100644
--- a/src/fs/virtfs/fsdir.cpp
+++ b/src/fs/virtfs/fsdir.cpp
@@ -37,7 +37,7 @@
#include <unistd.h>
#ifdef USE_FILE_FOPEN
-#include <stdio.h>
+#include <cstdio>
#endif // USE_FILE_FOPEN
#include <sys/types.h>
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 3ee10bdc7..09c1f3396 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -36,7 +36,7 @@
#endif // WIN32
#ifdef __clang__
-#include <time.h>
+#include <ctime>
#endif // __clang__
#include "debug.h"
diff --git a/src/sdl2gfx/SDL2_rotozoom.h b/src/sdl2gfx/SDL2_rotozoom.h
index 9a64d2a92..e77f946a8 100644
--- a/src/sdl2gfx/SDL2_rotozoom.h
+++ b/src/sdl2gfx/SDL2_rotozoom.h
@@ -30,7 +30,7 @@ Andreas Schiffler -- aschiffler at ferzkopp dot net
#ifndef _SDL2_rotozoom_h
#define _SDL2_rotozoom_h
-#include <math.h>
+#include <cmath>
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
diff --git a/src/utils/env.cpp b/src/utils/env.cpp
index 364493500..deb016931 100644
--- a/src/utils/env.cpp
+++ b/src/utils/env.cpp
@@ -24,7 +24,7 @@
#include "logger.h"
#include "settings.h"
-#include <stdlib.h>
+#include <cstdlib>
#include "debug.h"
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index 6431c22d5..56eaff27e 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -108,7 +108,7 @@ bool execFile(const std::string &pathName, const std::string &name A_UNUSED,
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
-#include <signal.h>
+#include <csignal>
int execFileWait(const std::string &pathName, const std::string &name,
const std::string &arg1, const std::string &arg2,