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

Tickler - move APPLE ifdef in direwolf.h #113

Closed
rlevine opened this issue Sep 13, 2017 · 1 comment
Closed

Tickler - move APPLE ifdef in direwolf.h #113

rlevine opened this issue Sep 13, 2017 · 1 comment

Comments

@rlevine
Copy link

rlevine commented Sep 13, 2017

(I'm putting this here so the change doesn't get lost.)

In direwolf.h, the APPLE define has to be after:

#include <pthread.h>

(Line 130 in the file, before this change.)

pthread.h pulls in <sys/cdefs.h>, which redefines __DARWIN_C_LEVEL back to ansi, which breaks things.

Diff for the corrected file, against 7247099:

➜ direwolf git:(dev) ✗ diff direwolf_7247099.h direwolf.h
34,46d33
<
< #ifdef APPLE
<
< // https://groups.yahoo.com/neo/groups/direwolf_packet/conversations/messages/2072
<
< // I think we should put it here, so it will apply to all files,
< // rather than only in ptt.c.
<
< #define __DARWIN_C_LEVEL __DARWIN_C_FULL
<
< #endif
<
<
132a120,130

#ifdef APPLE

// https://groups.yahoo.com/neo/groups/direwolf_packet/conversations/messages/2072

// I think we should put it here, so it will apply to all files,
// rather than only in ptt.c.

#define __DARWIN_C_LEVEL __DARWIN_C_FULL

#endif

@wb2osz
Copy link
Owner

wb2osz commented Oct 21, 2017

Added to "dev" branch.
5cb6e04
Thanks for your help with the Mac version.

@wb2osz wb2osz closed this as completed Oct 21, 2017
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

No branches or pull requests

2 participants