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

Openbsd ifdefs #4018

Merged
merged 5 commits into from Jul 18, 2016
Merged

Openbsd ifdefs #4018

merged 5 commits into from Jul 18, 2016

Conversation

bentley
Copy link
Contributor

@bentley bentley commented Jul 17, 2016

These fix most compilation problems under OpenBSD.


This change is Reviewable

@Parlane
Copy link
Member

Parlane commented Jul 18, 2016

This one fails our lint test.

See the output of this: https://buildbot.dolphin-emu.org/builders/lint/builds/2005/steps/shell/logs/stdio

@bentley
Copy link
Contributor Author

bentley commented Jul 18, 2016

Redid the last commit to wrap lines.

@Parlane
Copy link
Member

Parlane commented Jul 18, 2016

@dolphin-emu-bot rebuild

@Parlane
Copy link
Member

Parlane commented Jul 18, 2016

Reviewed 5 of 6 files at r1, 1 of 1 files at r2.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@Parlane
Copy link
Member

Parlane commented Jul 18, 2016

@dolphin-emu-bot rebuild you messed up!

@Parlane
Copy link
Member

Parlane commented Jul 18, 2016

@dolphin-emu-bot rebuild

@Parlane
Copy link
Member

Parlane commented Jul 18, 2016

Review status: 5 of 6 files reviewed at latest revision, 1 unresolved discussion.


Source/Core/Core/HW/EXI_DeviceEthernet.h, line 330 [r2] (raw file):

  std::vector<u8> mWriteBuffer;
  bool mWritePending;
#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \

Why did you change these lines?


Comments from Reviewable

@bentley
Copy link
Contributor Author

bentley commented Jul 18, 2016

I didn’t understand the wrapping rules in the linter. But that’s an old diff; cdf62de is the current one.

@phire
Copy link
Member

phire commented Jul 18, 2016

The linter is clang-format, you can run it on your own computer and it will spit out a diff (if you install clang 3.8).

git clang-format will automatically apply the changes needed to the files staged for commit.

int fd;
#endif

#if defined(WIN32) || defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
#if defined(WIN32) || defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \

This comment was marked as off-topic.

@bentley
Copy link
Contributor Author

bentley commented Jul 18, 2016

Source/Core/Core/HW/EXI_DeviceEthernet.h, line 334 [r3] (raw file):

Previously, Parlane (Matthew Parlane) wrote…

Does it really want all those spaces before the \ ?

That was straight from the output of the linter.

Comments from Reviewable

@Parlane
Copy link
Member

Parlane commented Jul 18, 2016

LGTM


Reviewed 1 of 1 files at r3.
Review status: all files reviewed at latest revision, 2 unresolved discussions.


Comments from Reviewable

@Parlane Parlane merged commit a51c992 into dolphin-emu:master Jul 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants