This repository has been archived by the owner on Jul 10, 2023. It is now read-only.
Stop using std::mutex on Windows builds. #1623
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reworked the threading code to an oslib and fixed some use of it. Had to add windows.h includes and some other minor refactor since some file were relaying on that header being already included. While we are at it replace min/max functions with std:: ones. Seems that we were using the windef.h defined macros (and no idea where they come from in Linux, which sounds scary to me).
skmp
reviewed
May 26, 2019
| @@ -1125,18 +1125,18 @@ struct maple_sega_purupuru : maple_base | |||
| INC = 0; | |||
| bool CNT = VIBSET & 1; | |||
|
|
|||
| float power = min((POW_POS + POW_NEG) / 7.0, 1.0); | |||
There was a problem hiding this comment.
In general, we have the habit of importing std for common functions like min. Too lazy to typestd::bs all the time
skmp
approved these changes
May 26, 2019
|
Just wanna avoid using some random min/max macro that depends on some windows header, which is fragile if a header changes due to some refactor. We can later decide to use "using std::min/max" and be done with it for easy reading. Thanks! |
davediff
approved these changes
May 26, 2019
| { | ||
| pthread_mutex_lock( &mutx ); | ||
| state=true; | ||
| pthread_cond_signal( &cond); |
| @@ -251,12 +251,10 @@ else ifneq (,$(findstring vero4k,$(platform))) | |||
| # Windows | |||
| else ifneq (,$(findstring win32,$(platform))) | |||
| NOT_ARM := 1 | |||
| CFLAGS += -DTARGET_NO_WEBUI -fno-builtin-sqrtf -funroll-loops -DHAVE_FSEEKO -D TARGET_NO_AREC | |||
| CFLAGS += -DNOMINMAX -DTARGET_NO_WEBUI -fno-builtin-sqrtf -funroll-loops -DHAVE_FSEEKO -D TARGET_NO_AREC | |||
There was a problem hiding this comment.
Also please add to cmake build.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reworked the threading code to an oslib and fixed some use of it.
Had to add windows.h includes and some other minor refactor since
some file were relaying on that header being already included.
While we are at it replace min/max functions with std:: ones.
Seems that we were using the windef.h defined macros (and no idea
where they come from in Linux, which sounds scary to me).