1[PATCH] fix mbtheme build issue when png support is disabled 2 3DEFAULTTHEME{,NAME} is not defined when png support is disabled, leading 4to compile errors in mbtheme.c: 5 6mbtheme.c: In function 'show_parse_error': 7mbtheme.c:2422:28: error: 'DEFAULTTHEME' undeclared (first use in this function) 8mbtheme.c:2422:28: note: each undeclared identifier is reported only once for each function it appears in 9mbtheme.c: In function 'mbtheme_init': 10mbtheme.c:2448:30: error: 'DEFAULTTHEME' undeclared (first use in this function) 11mbtheme.c:2470:25: error: 'DEFAULTTHEMENAME' undeclared (first use in this function) 12 13Fix it by unconditionally defining them as the values used are the same 14in png / !png cases anyway. 15 16Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> 17--- 18 src/structs.h | 9 --------- 19 1 file changed, 9 deletions(-) 20 21Index: matchbox-window-manager-1.2/src/structs.h 22=================================================================== 23--- matchbox-window-manager-1.2.orig/src/structs.h 24+++ matchbox-window-manager-1.2/src/structs.h 25@@ -81,8 +81,6 @@ 26 27 #define GENERIC_ICON PKGDATADIR "/mbnoapp.xpm" 28 29-#ifdef MB_HAVE_PNG 30- 31 #define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml" 32 33 #define DEFAULTTHEME DATADIR "/themes/Default/matchbox/theme.xml" 34@@ -91,13 +89,6 @@ 35 36 #define DEFAULTTHEMENAME "Default" 37 38-#else 39- 40-#define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml" 41-#define DEFAULT_THEME_NAME "Default" 42- 43-#endif 44- 45 #define CONFDEFAULTS PKGDATADIR "/defaults" 46 47 /* Simple Macros */ 48