But perhaps add this to test.h instead?

That seems clever:

$ git grep -l 'sleep(' *.c
lib1515.c
lib1542.c
lib2301.c
lib2302.c
lib2304.c

I agree. server\util.h already does something similar:

So what about this PR? Should I or @bagder merge it and change the other files in another PR?

So what about this PR?

You could update this PR with your proposed changes then force push to lib2304-sleep, for example

git checkout lib2304-sleep
#make changes
#stage changes using git gui or some other way
git commit --amend
git push -f

curl_setup.h is included by test.h so you don't need to check _WIN32 just WIN32

Review push access guidelines, specifically commit style, for example libtest: add sleep() macro for Windows

You could update this PR

Sorry, no. That's beyond my git knowledge.

Ok, I understand that, but it doesn't have to be. Amending a single commit can be done in git gui. If you can't or don't want to do that then you could add another commit to this branch with the new changes and I will squash them together (essentially, your existing changes in lib2304 would disappear) before I commit it.

(Also, as described in the guidelines you should work in your own fork of the curl repo. There are some exceptions for this suchas @bagder.)

Here's a screenshot from git gui

@gvanem if you want I can finish this

@jay Yes, please do.

Thanks