-
Notifications
You must be signed in to change notification settings - Fork 465
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Is this enough? The out_of_memory macro defined in util.cpp is under the Sass namespace |
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) ❤️ |
I'm ok with inlininh, or even just renaming the Sass namespaced version.
…On Wed., 28 Mar. 2018, 5:45 am Andrew Stone, ***@***.***> wrote:
It looks like the file came from json.c
<https://github.com/rustyrussell/ccan/blob/master/ccan/json/json.c>,
which, as @nschonni <https://github.com/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?
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#2619 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAjZWMvJLbtKFbFIYlJqiXO1N2hTJKImks5tiojXgaJpZM4S8FZZ>
.
|
xzyfer
approved these changes
Mar 27, 2018
Thanks |
xzyfer
added
Back port to 3.5 stable
Dev - Internal
ported to 3.5
and removed
Back port to 3.5 stable
labels
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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