diff options
author | firewave <firewave@users.noreply.github.com> | 2020-01-22 13:31:52 +0100 |
---|---|---|
committer | firewave <firewave@users.noreply.github.com> | 2020-01-22 13:31:52 +0100 |
commit | 399515c7a783f84b5c40c5e1733500b3d62bf634 (patch) | |
tree | 8f2329af45b7ab0e44ba32c0a1522f3e4184a130 /src/osd | |
parent | ddf571d8d4488fe9f1003f1cf219cc31d8868283 (diff) |
use C++ library includes (nw)
Diffstat (limited to 'src/osd')
42 files changed, 68 insertions, 68 deletions
diff --git a/src/osd/eigccx86.h b/src/osd/eigccx86.h index 3c8f63aa47e..c5ec0848e01 100644 --- a/src/osd/eigccx86.h +++ b/src/osd/eigccx86.h @@ -15,7 +15,7 @@ // Include MMX/SSE intrinsics headers #ifdef __SSE2__ -#include <stdlib.h> +#include <cstdlib> #include <mmintrin.h> // MMX #include <xmmintrin.h> // SSE #include <emmintrin.h> // SSE2 diff --git a/src/osd/mac/window.cpp b/src/osd/mac/window.cpp index d22268f86f4..8a1f4d3fd3f 100644 --- a/src/osd/mac/window.cpp +++ b/src/osd/mac/window.cpp @@ -9,7 +9,7 @@ //============================================================ // standard C headers -#include <math.h> +#include <cmath> #ifndef _MSC_VER #include <unistd.h> #endif diff --git a/src/osd/modules/debugger/osx/debugview.mm b/src/osd/modules/debugger/osx/debugview.mm index 731ea8227b2..a414e4ad8a4 100644 --- a/src/osd/modules/debugger/osx/debugview.mm +++ b/src/osd/modules/debugger/osx/debugview.mm @@ -16,7 +16,7 @@ #include "util/xmlfile.h" -#include <string.h> +#include <cstring> static NSColor *DefaultForeground; diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp index 8c78d28cbd5..4f56a8432d4 100644 --- a/src/osd/modules/file/posixfile.cpp +++ b/src/osd/modules/file/posixfile.cpp @@ -50,9 +50,9 @@ #include <vector> #include <fcntl.h> -#include <limits.h> +#include <climits> #include <sys/stat.h> -#include <stdlib.h> +#include <cstdlib> #include <unistd.h> diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp index a590dc682e2..5b38acc750a 100644 --- a/src/osd/modules/file/posixptty.cpp +++ b/src/osd/modules/file/posixptty.cpp @@ -15,9 +15,9 @@ #include <cstring> #include <fcntl.h> -#include <limits.h> +#include <climits> #include <unistd.h> -#include <stdlib.h> +#include <cstdlib> #if defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <termios.h> diff --git a/src/osd/modules/file/stdfile.cpp b/src/osd/modules/file/stdfile.cpp index cb1f1b536b2..0bf38945f5a 100644 --- a/src/osd/modules/file/stdfile.cpp +++ b/src/osd/modules/file/stdfile.cpp @@ -14,7 +14,7 @@ #include <cstdlib> #include <string> -#include <stdio.h> // for fileno +#include <cstdio> // for fileno #include <unistd.h> // for ftruncate diff --git a/src/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp index f9575b27e74..73bcae13f04 100644 --- a/src/osd/modules/file/windir.cpp +++ b/src/osd/modules/file/windir.cpp @@ -20,8 +20,8 @@ #include "winutil.h" // standard C headers -#include <stdio.h> -#include <ctype.h> +#include <cstdio> +#include <cctype> #include <cassert> #include <cstring> diff --git a/src/osd/modules/file/winfile.cpp b/src/osd/modules/file/winfile.cpp index 5df7c4bb8b1..b0869b7c70f 100644 --- a/src/osd/modules/file/winfile.cpp +++ b/src/osd/modules/file/winfile.cpp @@ -26,8 +26,8 @@ #include <winioctl.h> #include <tchar.h> #include <shlwapi.h> -#include <stdlib.h> -#include <ctype.h> +#include <cstdlib> +#include <cctype> namespace { diff --git a/src/osd/modules/file/winptty.cpp b/src/osd/modules/file/winptty.cpp index 61867a869df..1dbc7e5cd05 100644 --- a/src/osd/modules/file/winptty.cpp +++ b/src/osd/modules/file/winptty.cpp @@ -10,7 +10,7 @@ #include <cassert> #include <windows.h> -#include <stdlib.h> +#include <cstdlib> namespace { diff --git a/src/osd/modules/file/winrtdir.cpp b/src/osd/modules/file/winrtdir.cpp index be42b6fd874..2d61097a3b4 100644 --- a/src/osd/modules/file/winrtdir.cpp +++ b/src/osd/modules/file/winrtdir.cpp @@ -20,8 +20,8 @@ #include "../../windows/winutil.h" // standard C headers -#include <stdio.h> -#include <ctype.h> +#include <cstdio> +#include <cctype> #include <cassert> #include <cstring> diff --git a/src/osd/modules/file/winrtfile.cpp b/src/osd/modules/file/winrtfile.cpp index 83d8d7c4915..8e6ed4e5f43 100644 --- a/src/osd/modules/file/winrtfile.cpp +++ b/src/osd/modules/file/winrtfile.cpp @@ -26,8 +26,8 @@ #include <winioctl.h> #include <tchar.h> #include <shlwapi.h> -#include <stdlib.h> -#include <ctype.h> +#include <cstdlib> +#include <cctype> namespace { diff --git a/src/osd/modules/file/winrtptty.cpp b/src/osd/modules/file/winrtptty.cpp index ec1e6e73b38..b442409a79e 100644 --- a/src/osd/modules/file/winrtptty.cpp +++ b/src/osd/modules/file/winrtptty.cpp @@ -9,7 +9,7 @@ #include <cassert> #include <windows.h> -#include <stdlib.h> +#include <cstdlib> namespace { diff --git a/src/osd/modules/file/winrtsocket.cpp b/src/osd/modules/file/winrtsocket.cpp index 3f2241c25b5..3e4880605bf 100644 --- a/src/osd/modules/file/winrtsocket.cpp +++ b/src/osd/modules/file/winrtsocket.cpp @@ -19,8 +19,8 @@ #include <windows.h> #include <winioctl.h> #include <tchar.h> -#include <stdlib.h> -#include <ctype.h> +#include <cstdlib> +#include <cctype> namespace { diff --git a/src/osd/modules/file/winsocket.cpp b/src/osd/modules/file/winsocket.cpp index a383a876f9d..9fd0bb31165 100644 --- a/src/osd/modules/file/winsocket.cpp +++ b/src/osd/modules/file/winsocket.cpp @@ -22,8 +22,8 @@ #include <windows.h> #include <winioctl.h> #include <tchar.h> -#include <stdlib.h> -#include <ctype.h> +#include <cstdlib> +#include <cctype> namespace { diff --git a/src/osd/modules/input/input_mac.cpp b/src/osd/modules/input/input_mac.cpp index 0784501573f..85afdaeb9cb 100644 --- a/src/osd/modules/input/input_mac.cpp +++ b/src/osd/modules/input/input_mac.cpp @@ -14,8 +14,8 @@ #if defined(OSD_MAC) // System headers -#include <ctype.h> -#include <stddef.h> +#include <cctype> +#include <cstddef> #include <mutex> #include <memory> #include <algorithm> diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp index 4d09441b24e..51af4750eb1 100644 --- a/src/osd/modules/input/input_sdl.cpp +++ b/src/osd/modules/input/input_sdl.cpp @@ -18,9 +18,9 @@ // standard sdl header #include <SDL2/SDL.h> -#include <ctype.h> +#include <cctype> // ReSharper disable once CppUnusedIncludeDirective -#include <stddef.h> +#include <cstddef> #include <mutex> #include <memory> #include <queue> diff --git a/src/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp index 2e6611c74ac..a227fa9f46f 100644 --- a/src/osd/modules/input/input_sdlcommon.cpp +++ b/src/osd/modules/input/input_sdlcommon.cpp @@ -15,8 +15,8 @@ // standard sdl header #include <SDL2/SDL.h> -#include <ctype.h> -#include <stddef.h> +#include <cctype> +#include <cstddef> #include <mutex> #include <memory> #include <algorithm> diff --git a/src/osd/modules/input/input_x11.cpp b/src/osd/modules/input/input_x11.cpp index 6b66220e32a..e8888865ad5 100644 --- a/src/osd/modules/input/input_x11.cpp +++ b/src/osd/modules/input/input_x11.cpp @@ -20,8 +20,8 @@ // standard sdl header #include <SDL2/SDL.h> -#include <ctype.h> -#include <stddef.h> +#include <cctype> +#include <cstddef> #include <mutex> #include <memory> #include <queue> diff --git a/src/osd/modules/lib/osdlib_macosx.cpp b/src/osd/modules/lib/osdlib_macosx.cpp index 372293ec1a3..6f7f5f4c3e6 100644 --- a/src/osd/modules/lib/osdlib_macosx.cpp +++ b/src/osd/modules/lib/osdlib_macosx.cpp @@ -8,12 +8,12 @@ // //============================================================ -#include <stdlib.h> +#include <cstdlib> #include <unistd.h> #include <sys/mman.h> #include <sys/sysctl.h> #include <sys/types.h> -#include <signal.h> +#include <csignal> #include <dlfcn.h> #include <cstdio> diff --git a/src/osd/modules/lib/osdlib_unix.cpp b/src/osd/modules/lib/osdlib_unix.cpp index 2b0e7a3d780..c2a34be7c98 100644 --- a/src/osd/modules/lib/osdlib_unix.cpp +++ b/src/osd/modules/lib/osdlib_unix.cpp @@ -8,11 +8,11 @@ // //============================================================ -#include <stdlib.h> +#include <cstdlib> #include <unistd.h> #include <sys/mman.h> #include <sys/types.h> -#include <signal.h> +#include <csignal> #include <dlfcn.h> #include <cstdio> diff --git a/src/osd/modules/lib/osdlib_uwp.cpp b/src/osd/modules/lib/osdlib_uwp.cpp index 8d20c552cab..680594d9cc8 100644 --- a/src/osd/modules/lib/osdlib_uwp.cpp +++ b/src/osd/modules/lib/osdlib_uwp.cpp @@ -11,7 +11,7 @@ #include <windows.h> #include <mmsystem.h> -#include <stdlib.h> +#include <cstdlib> #include <cstdio> #include <memory> diff --git a/src/osd/modules/lib/osdlib_win32.cpp b/src/osd/modules/lib/osdlib_win32.cpp index 911f95c3bfe..018161c6c0c 100644 --- a/src/osd/modules/lib/osdlib_win32.cpp +++ b/src/osd/modules/lib/osdlib_win32.cpp @@ -11,7 +11,7 @@ #include <windows.h> #include <mmsystem.h> -#include <stdlib.h> +#include <cstdlib> #ifndef _MSC_VER #include <unistd.h> #endif diff --git a/src/osd/modules/netdev/taptun.cpp b/src/osd/modules/netdev/taptun.cpp index 91ca323a178..df3ab7bf38d 100644 --- a/src/osd/modules/netdev/taptun.cpp +++ b/src/osd/modules/netdev/taptun.cpp @@ -10,7 +10,7 @@ #include <fcntl.h> #include <sys/ioctl.h> #include <net/if.h> -#include <errno.h> +#include <cerrno> #endif #include "emu.h" diff --git a/src/osd/modules/opengl/gl_shader_mgr.cpp b/src/osd/modules/opengl/gl_shader_mgr.cpp index 0cf3f9b6617..a4f01bca611 100644 --- a/src/osd/modules/opengl/gl_shader_mgr.cpp +++ b/src/osd/modules/opengl/gl_shader_mgr.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Sven Gothel -#include <stdio.h> /* snprintf */ -#include <stdlib.h> /* malloc */ +#include <cstdio> /* snprintf */ +#include <cstdlib> /* malloc */ #include "osdcomm.h" #include "osd_opengl.h" diff --git a/src/osd/modules/render/bgfx/statereader.cpp b/src/osd/modules/render/bgfx/statereader.cpp index 0f43ad71b09..afc6d652d9b 100644 --- a/src/osd/modules/render/bgfx/statereader.cpp +++ b/src/osd/modules/render/bgfx/statereader.cpp @@ -9,7 +9,7 @@ #include "statereader.h" -#include <math.h> +#include <cmath> uint64_t state_reader::get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count) { diff --git a/src/osd/modules/render/bgfx/texture.cpp b/src/osd/modules/render/bgfx/texture.cpp index 7b6747e0c54..a187741798d 100644 --- a/src/osd/modules/render/bgfx/texture.cpp +++ b/src/osd/modules/render/bgfx/texture.cpp @@ -6,7 +6,7 @@ // //============================================================ -#include <string.h> +#include <cstring> #include "texture.h" diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp index f99ebf70601..96b04efc3d9 100644 --- a/src/osd/modules/render/draw13.cpp +++ b/src/osd/modules/render/draw13.cpp @@ -11,8 +11,8 @@ //============================================================ // standard C headers -#include <math.h> -#include <stdio.h> +#include <cmath> +#include <cstdio> // MAME headers #include "emu.h" diff --git a/src/osd/modules/render/drawd3d.h b/src/osd/modules/render/drawd3d.h index 92923904d77..03527d7374e 100644 --- a/src/osd/modules/render/drawd3d.h +++ b/src/osd/modules/render/drawd3d.h @@ -18,7 +18,7 @@ #include <mmsystem.h> #include <d3d9.h> #include <d3dx9.h> -#include <math.h> +#include <cmath> #undef interface #include "d3d/d3dcomm.h" diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp index 7ab0488dfe2..6ee43cd57b7 100644 --- a/src/osd/modules/render/drawogl.cpp +++ b/src/osd/modules/render/drawogl.cpp @@ -13,8 +13,8 @@ //============================================================ // standard C headers -#include <math.h> -#include <stdio.h> +#include <cmath> +#include <cstdio> // MAME headers #include "osdcomm.h" @@ -41,8 +41,8 @@ #include "modules/opengl/gl_shader_mgr.h" #if defined(SDLMAME_MACOSX) || defined(OSD_MAC) -#include <string.h> -#include <stdio.h> +#include <cstring> +#include <cstdio> #include <sys/types.h> #include <sys/sysctl.h> diff --git a/src/osd/modules/render/drawsdl.cpp b/src/osd/modules/render/drawsdl.cpp index 5e04f6d4b15..76dc1375e5b 100644 --- a/src/osd/modules/render/drawsdl.cpp +++ b/src/osd/modules/render/drawsdl.cpp @@ -11,8 +11,8 @@ //============================================================ // standard C headers -#include <math.h> -#include <stdio.h> +#include <cmath> +#include <cstdio> // MAME headers #include "emu.h" diff --git a/src/osd/modules/sound/coreaudio_sound.cpp b/src/osd/modules/sound/coreaudio_sound.cpp index 1eb7e7fff30..dd9c953ceb5 100644 --- a/src/osd/modules/sound/coreaudio_sound.cpp +++ b/src/osd/modules/sound/coreaudio_sound.cpp @@ -21,7 +21,7 @@ #include <memory> #include <new> -#include <string.h> +#include <cstring> #ifdef MAC_OS_X_VERSION_MAX_ALLOWED diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h index 7e7ac805ad2..dfb9ab8ecde 100644 --- a/src/osd/osdcomm.h +++ b/src/osd/osdcomm.h @@ -13,8 +13,8 @@ #pragma once -#include <stdio.h> -#include <string.h> +#include <cstdio> +#include <cstring> #include <array> #include <cstdint> diff --git a/src/osd/osdcore.cpp b/src/osd/osdcore.cpp index 250f51a90bc..0b0a0185837 100644 --- a/src/osd/osdcore.cpp +++ b/src/osd/osdcore.cpp @@ -11,7 +11,7 @@ #ifdef _WIN32 #include <windows.h> -#include <stdio.h> +#include <cstdio> #include <shellapi.h> #include "strconv.h" #endif diff --git a/src/osd/osdsync.cpp b/src/osd/osdsync.cpp index f8143aa2c51..f18efb7fac2 100644 --- a/src/osd/osdsync.cpp +++ b/src/osd/osdsync.cpp @@ -10,10 +10,10 @@ #include <windows.h> #include <process.h> #include <tchar.h> -#include <stdlib.h> +#include <cstdlib> #ifdef __GNUC__ -#include <stdint.h> +#include <cstdint> #endif #endif #include <mutex> diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp index e12337e4a97..70886d76a73 100644 --- a/src/osd/sdl/window.cpp +++ b/src/osd/sdl/window.cpp @@ -16,7 +16,7 @@ #include <SDL2/SDL.h> // standard C headers -#include <math.h> +#include <cmath> #ifndef _MSC_VER #include <unistd.h> #endif diff --git a/src/osd/strconv.cpp b/src/osd/strconv.cpp index 9ea2e00bd1a..717a17d862c 100644 --- a/src/osd/strconv.cpp +++ b/src/osd/strconv.cpp @@ -9,7 +9,7 @@ #include <windows.h> #endif #include <algorithm> -#include <assert.h> +#include <cassert> // MAMEOS headers #include "strconv.h" diff --git a/src/osd/uwp/uwpcompat.cpp b/src/osd/uwp/uwpcompat.cpp index bd7103b8e31..e4e1149f72c 100644 --- a/src/osd/uwp/uwpcompat.cpp +++ b/src/osd/uwp/uwpcompat.cpp @@ -9,7 +9,7 @@ #include "uwpcompat.h" #include <windows.h> -#include <errno.h> +#include <cerrno> #undef interface diff --git a/src/osd/uwp/uwpcompat.h b/src/osd/uwp/uwpcompat.h index 2d495238a99..5d0dbb07dcb 100644 --- a/src/osd/uwp/uwpcompat.h +++ b/src/osd/uwp/uwpcompat.h @@ -17,7 +17,7 @@ extern "C" { #define NOGDI #endif #include <windows.h> -#include <stdio.h> +#include <cstdio> int system(const char *command); diff --git a/src/osd/windows/ledutil.cpp b/src/osd/windows/ledutil.cpp index 8f2a781b427..f1976cd41bc 100644 --- a/src/osd/windows/ledutil.cpp +++ b/src/osd/windows/ledutil.cpp @@ -34,9 +34,9 @@ // standard C headers #include <conio.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> // MAME output header file typedef int running_machine; diff --git a/src/osd/windows/main.cpp b/src/osd/windows/main.cpp index 6d81d824f02..cfadf9ffe0b 100644 --- a/src/osd/windows/main.cpp +++ b/src/osd/windows/main.cpp @@ -12,7 +12,7 @@ #endif #include <windows.h> #include <tchar.h> -#include <stdlib.h> +#include <cstdlib> #include <vector> #include <string> diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp index 1ce656c2a37..a16904c2aa8 100644 --- a/src/osd/windows/winmain.cpp +++ b/src/osd/windows/winmain.cpp @@ -21,9 +21,9 @@ #include "modules/monitor/monitor_common.h" // standard C headers -#include <ctype.h> -#include <stdarg.h> -#include <stdio.h> +#include <cctype> +#include <cstdarg> +#include <cstdio> // standard windows headers #include <windows.h> diff --git a/src/osd/windows/winutf8.cpp b/src/osd/windows/winutf8.cpp index a860aeb55cc..bfc1d86ad38 100644 --- a/src/osd/windows/winutf8.cpp +++ b/src/osd/windows/winutf8.cpp @@ -10,7 +10,7 @@ #include "winutf8.h" #include "strconv.h" -#include <stdlib.h> +#include <cstdlib> // standard windows headers #include <shellapi.h> |