Fix glib cmake script and only call OnOpen callback if set #1931
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
… hard coded path to /usr/lib. the OnOpen callback should be called when set to avoid a segfault.
|
Can one of the members verify this patch? |
|
I am going on vacation the next two weeks, so I will not be around to modify this pull request for any suggestions that may arise. I just wanted to hurry and get something up for others to see since these items caused me some trouble today. |
|
@freerdp-bot test. |
|
Test PASSed. |
awakecoding
added a commit
that referenced
this pull request
Jun 30, 2014
Fix glib cmake script and only call OnOpen callback if set
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.
Find glibconfig.h cmake script should use pkgconfig information instead of a hard coded path to /usr/lib. There may be a better way to handle this, but I found on my 64-bit system with both 32-bit and 64-bit versions of glib installed that the wrong version(32-bit) of glibconfig.h was being used and causing a compile error.
the OnOpen callback should be called when set to avoid a segfault.
I was getting a segfault when trying to use tsmf, so I fixed that case here. It looks like there might be a few other cases where we should make sure that the OnOpen function pointer gets set to NULL as well.