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

Fix mac compilation #497

Merged
merged 2 commits into from
Dec 25, 2018
Merged

Conversation

xrdavies
Copy link
Contributor

  • Fix mac compilation

@ghost ghost assigned xrdavies Dec 25, 2018
@ghost ghost added the in progress label Dec 25, 2018
@jonano614 jonano614 merged commit 1f879b0 into XDagger:develop Dec 25, 2018
@ghost ghost removed the in progress label Dec 25, 2018
@xrdavies xrdavies deleted the fix_mac_compilation branch December 26, 2018 13:15
@@ -66,7 +66,12 @@ extern int g_disable_mining;
//Test network and main network have different types of the block headers, so blocks from different networks are incompatible
extern enum xdag_field_type g_block_header_type;

#if defined (__MACOS__) || defined (__APPLE__)
extern int is_pool(void);
extern int is_wallet(void);
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the compilation error? it is strange to me,
inline int is_pool(void) { return g_xdag_type == XDAG_POOL; }
it is C standard... anything strange.

extern int is_pool(void); <-- it is not inlined anyway, it is only inlined in global.c file but not in other files

Copy link
Contributor

Choose a reason for hiding this comment

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

I tried it on my mac and i have no errors about it... :/

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.

3 participants