From af906eb7375975ac70eae0b9cf6aa7f9f2ff402f Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Fri, 21 Oct 2011 15:50:43 +0000 Subject: [PATCH] Some hack to prevent gcc warnings. This could be solved by separate file, but... --- ede-preferred-applications/PredefApps.h | 3 +++ ede-preferred-applications/ede-preferred-applications.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ede-preferred-applications/PredefApps.h b/ede-preferred-applications/PredefApps.h index 8708be3..3627f47 100644 --- a/ede-preferred-applications/PredefApps.h +++ b/ede-preferred-applications/PredefApps.h @@ -10,6 +10,8 @@ struct KnownApp { #define KNOWN_APP_END {0, 0} +/* to allow inclusion from single place, without issuing gcc warnings */ +#if KNOWN_APP_PREDEFINED static KnownApp app_browsers[] = { {"Mozilla Firefox", "firefox"}, {"Mozilla Seamonkey", "seamonkey"}, @@ -40,5 +42,6 @@ static KnownApp app_terminals[] = { {"Xfce Terminal", "xfterm4"}, KNOWN_APP_END }; +#endif #endif diff --git a/ede-preferred-applications/ede-preferred-applications.cpp b/ede-preferred-applications/ede-preferred-applications.cpp index 991a35c..6892a8f 100644 --- a/ede-preferred-applications/ede-preferred-applications.cpp +++ b/ede-preferred-applications/ede-preferred-applications.cpp @@ -14,6 +14,8 @@ #include #include +#define KNOWN_APP_PREDEFINED 1 +#include "PredefApps.h" #include "AppChoice.h" #define EMPTY_STR(s) (s[0] == '\0' || (strlen(s) == 0))