Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Windows project #119

Merged
merged 2 commits into from Mar 19, 2018
Merged

Update Windows project #119

merged 2 commits into from Mar 19, 2018

Conversation

kuleshov-aleksei
Copy link
Contributor

  • Update MSVS15 project
  • Deleted gather.c from project

#ifdef __linux__
#include <unistd.h>
#endif

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of #ifdef linux, please use:

#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

@kuleshov-aleksei
Copy link
Contributor Author

kuleshov-aleksei commented Mar 16, 2018

Now it is using HAVE_UNISTD_H instead of linux

@alfredh
Copy link
Contributor

alfredh commented Mar 16, 2018

thanks.

for some reason you changed the mqueue.c file from unix format to DOS format.

the ccheck is failing:

./src/mqueue/mqueue.c:1: not in Unix format

please change the file back to Unix format.

the rest of the PR looks okay to me.

@kuleshov-aleksei
Copy link
Contributor Author

Sorry, I didn't notice this. Now it changed back to Unix format

@alfredh
Copy link
Contributor

alfredh commented Mar 16, 2018

this PR looks okay to me.

@richaas please merge if you agree.

#include <unistd.h>
#endif

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove extra blank line

@kuleshov-aleksei
Copy link
Contributor Author

@richaas this line is removed now

@alfredh
Copy link
Contributor

alfredh commented Mar 19, 2018

this looks okay to me now. okay to merge ?

@richaas richaas merged commit 36e611a into creytiv:master Mar 19, 2018
@alfredh
Copy link
Contributor

alfredh commented Mar 19, 2018

I think those files was already in DOS format.

I run this locally:

$ todos mk/win32/*

and git diff shows no difference.

@richaas
Copy link
Contributor

richaas commented Mar 19, 2018

Yes, that's correct. That's why I removed my comment :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants