ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts #1806
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.
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.
Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.
Signed-off-by: Qu Wenruo quwenruo@cn.fujitsu.com