citra-emu
/
citra
Archived
1
0
Fork 0

Common: Move remaining C header includes over to their C++ equivalent

This commit is contained in:
Lioncash 2014-08-17 13:54:06 -04:00
parent 90e994471a
commit da6f24b374
8 changed files with 20 additions and 21 deletions

View File

@ -2,15 +2,15 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm> // min #include <algorithm>
#include <string> // System: To be able to add strings with "+" #include <cmath>
#include <stdio.h> #include <cstdio>
#include <math.h> #include <string>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <array> #include <array>
#else #else
#include <stdarg.h> #include <cstdarg>
#endif #endif
#include "common/common.h" #include "common/common.h"

View File

@ -13,9 +13,8 @@
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
#if defined(WIN32) #if defined(WIN32)
#include <cstdio>
#include <windows.h> #include <windows.h>
#include <stdio.h>
#include "common/extended_trace.h" #include "common/extended_trace.h"
#include "common/string_util.h" #include "common/string_util.h"
using namespace std; using namespace std;

View File

@ -16,11 +16,11 @@
#include <io.h> #include <io.h>
#include <direct.h> // getcwd #include <direct.h> // getcwd
#else #else
#include <cerrno>
#include <cstdlib>
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
#include <dirent.h> #include <dirent.h>
#include <errno.h>
#include <stdlib.h>
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)

View File

@ -11,8 +11,8 @@
#include <windows.h> #include <windows.h>
#include <psapi.h> #include <psapi.h>
#else #else
#include <errno.h> #include <cerrno>
#include <stdio.h> #include <cstdio>
#endif #endif
#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <stdio.h> // System #include <cstdio>
#include "common/common.h" // Local #include "common/common.h" // Local
#include "common/string_util.h" #include "common/string_util.h"

View File

@ -2,9 +2,9 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <stdlib.h>
#include <stdio.h>
#include <algorithm> #include <algorithm>
#include <cstdlib>
#include <cstdio>
#include "common/common.h" #include "common/common.h"
#include "common/common_paths.h" #include "common/common_paths.h"
@ -13,8 +13,8 @@
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
#else #else
#include <cerrno>
#include <iconv.h> #include <iconv.h>
#include <errno.h>
#endif #endif
/// Make a string lowercase /// Make a string lowercase

View File

@ -10,8 +10,8 @@
// Don't include common.h here as it will break LogManager // Don't include common.h here as it will break LogManager
#include "common/common_types.h" #include "common/common_types.h"
#include <stdio.h> #include <cstdio>
#include <string.h> #include <cstring>
// This may not be defined outside _WIN32 // This may not be defined outside _WIN32
#ifndef _WIN32 #ifndef _WIN32

View File

@ -18,10 +18,10 @@
#undef max #undef max
#endif #endif
#include <stdlib.h> #include <cstdlib>
#include <stdio.h> #include <cstdio>
#include <string.h> #include <cstring>
#include <stdarg.h> #include <cstdarg>
#include <algorithm> #include <algorithm>
#include <string> #include <string>