correct compilation errors, ODR violation

fixes up commit 30c1a85
wesnoth · Oct 16, 2016 · 415cdd7 · 415cdd7
1 parent 0f3fdb6
commit 415cdd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/font/constants.cpp b/src/font/constants.cpp
@@ -34,9 +34,9 @@ const SDL_Color NORMAL_COLOR = {0xDD,0xDD,0xDD,0},
 				BIGMAP_COLOR = {0xFF,0xFF,0xFF,0};
 const SDL_Color DISABLED_COLOR = inverse(PETRIFIED_COLOR);
 
-CONSTEXPR int SIZE_NORMAL = 14;
+const int SIZE_NORMAL = 14;
 
-CONSTEXPR int
+const int
 	SIZE_TINY = 10 * SIZE_NORMAL / 14,
 	SIZE_SMALL = 12 * SIZE_NORMAL / 14,
 
@@ -47,7 +47,7 @@ CONSTEXPR int
 	SIZE_XLARGE = 24 * SIZE_NORMAL / 14
 ;
 
-CONSTEXPR size_t max_text_line_width = 4096;
+const size_t max_text_line_width = 4096;
 
 const std::string
 	ellipsis = "...",

diff --git a/src/font/constants.hpp b/src/font/constants.hpp
@@ -34,7 +34,7 @@ extern const int SIZE_TINY, SIZE_SMALL,
 
 // For arbitrary scaling:
 // (Not used in defining the SIZE_* consts because of spurious compiler warnings.)
-const inline int relative_size(int size)
+inline int relative_size(int size)
 {
 	return (SIZE_NORMAL * size / 14);
 }