Skip to content

Commit

Permalink
Squashed 'thirdparty/libchdr/' changes from 2a1119c686..5c598c2df3
Browse files Browse the repository at this point in the history
5c598c2df3 Merge pull request ares-emulator#115 from notaz/gitignore
4cbba6df03 add a basic .gitignore
7239eab39c Merge pull request ares-emulator#114 from bslenul/windows-case-include
e2589a612c Make sure all windows.h includes are lowercase

git-subtree-dir: thirdparty/libchdr
git-subtree-split: 5c598c2df3a7717552a76410d79f5af01ff51b1d
  • Loading branch information
LukeUsher committed Mar 28, 2024
1 parent b4399c5 commit ad70fad
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.o
*.d
build/
2 changes: 1 addition & 1 deletion deps/lzma-22.01/include/Threads.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define __7Z_THREADS_H

#ifdef _WIN32
#include <Windows.h>
#include <windows.h>
#else

#if defined(__linux__)
Expand Down
2 changes: 1 addition & 1 deletion deps/lzma-22.01/src/Alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <stdio.h>

#ifdef _WIN32
#include <Windows.h>
#include <windows.h>
#endif
#include <stdlib.h>

Expand Down
6 changes: 3 additions & 3 deletions deps/lzma-22.01/src/CpuArch.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ BoolInt CPU_Is_InOrder()
}

#if !defined(MY_CPU_AMD64) && defined(_WIN32)
#include <Windows.h>
#include <windows.h>
static BoolInt CPU_Sys_Is_SSE_Supported()
{
OSVERSIONINFO vi;
Expand Down Expand Up @@ -275,7 +275,7 @@ BoolInt CPU_IsSupported_SHA()
// #include <stdio.h>

#ifdef _WIN32
#include <Windows.h>
#include <windows.h>
#endif

BoolInt CPU_IsSupported_AVX2()
Expand Down Expand Up @@ -351,7 +351,7 @@ BoolInt CPU_IsSupported_PageGB()

#ifdef _WIN32

#include <Windows.h>
#include <windows.h>

BoolInt CPU_IsSupported_CRC32() { return IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
BoolInt CPU_IsSupported_CRYPTO() { return IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
Expand Down

0 comments on commit ad70fad

Please sign in to comment.