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

Remove duplicate definition of out_of_memory macro #2619

Merged
merged 1 commit into from
Mar 28, 2018

Conversation

thatguystone
Copy link
Contributor

When combining the project into a single file (as go-libsass does), gcc complains that out_of_memory is redefined.

Ref: wellington/go-libsass#57

@xzyfer
Copy link
Contributor

xzyfer commented Mar 27, 2018

Is this enough? The out_of_memory macro defined in util.cpp is under the Sass namespace

@nschonni
Copy link
Collaborator

This file is a copy/paste from another library, so editiing might not be the best solution. Just thinking of if we ever try to sync it again (although I think it's been static since the 2011 copyright header) ❤️

@thatguystone
Copy link
Contributor Author

It looks like the file came from json.c, which, as @nschonni noted, hasn't been updated since 2011.

Apart from the usage in json.cpp, out_of_memory is only used once, so it might be better just inline it. Thoughts?

@xzyfer
Copy link
Contributor

xzyfer commented Mar 27, 2018 via email

@thatguystone thatguystone reopened this Mar 27, 2018
@xzyfer
Copy link
Contributor

xzyfer commented Mar 27, 2018

Thanks

@xzyfer xzyfer merged commit f315c93 into sass:master Mar 28, 2018
drewwells added a commit to wellington/go-libsass that referenced this pull request May 9, 2018
drewwells added a commit to wellington/go-libsass that referenced this pull request May 9, 2018
drewwells added a commit to wellington/go-libsass that referenced this pull request May 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants