From aa2c86bd56437197de27cb6a539125edcf7afea0 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 8 Jan 2011 22:37:13 +0000 Subject: [PATCH] pictureviewer: rename config.h to pv_config.h this avoids confusion with the global config.h, which in turn caused very hard to debug runtime failures when objects were compiled with different defines, causing e.g. g_settings to have different sizes... git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1022 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/7a988880173178741166400516adbd8abe5ee994 Author: Stefan Seyfried Date: 2011-01-08 (Sat, 08 Jan 2011) --- src/driver/pictureviewer/bmp.cpp | 2 +- src/driver/pictureviewer/crw.cpp | 2 +- src/driver/pictureviewer/gif.cpp | 2 +- src/driver/pictureviewer/jpeg.cpp | 2 +- src/driver/pictureviewer/pictureviewer.cpp | 3 ++- src/driver/pictureviewer/png.cpp | 2 +- src/driver/pictureviewer/{config.h => pv_config.h} | 0 7 files changed, 7 insertions(+), 6 deletions(-) rename src/driver/pictureviewer/{config.h => pv_config.h} (100%) diff --git a/src/driver/pictureviewer/bmp.cpp b/src/driver/pictureviewer/bmp.cpp index a666aa7bf..7655ceadb 100644 --- a/src/driver/pictureviewer/bmp.cpp +++ b/src/driver/pictureviewer/bmp.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include "pv_config.h" #ifdef FBV_SUPPORT_BMP #include "pictureviewer.h" #include diff --git a/src/driver/pictureviewer/crw.cpp b/src/driver/pictureviewer/crw.cpp index 9910d1ccb..0c217cdf0 100644 --- a/src/driver/pictureviewer/crw.cpp +++ b/src/driver/pictureviewer/crw.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include "pv_config.h" #include #include #ifdef FBV_SUPPORT_CRW diff --git a/src/driver/pictureviewer/gif.cpp b/src/driver/pictureviewer/gif.cpp index 84415c67d..5f43dd3d6 100644 --- a/src/driver/pictureviewer/gif.cpp +++ b/src/driver/pictureviewer/gif.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include "pv_config.h" #include #include diff --git a/src/driver/pictureviewer/jpeg.cpp b/src/driver/pictureviewer/jpeg.cpp index db7ac2fa2..69ac998a2 100644 --- a/src/driver/pictureviewer/jpeg.cpp +++ b/src/driver/pictureviewer/jpeg.cpp @@ -2,7 +2,7 @@ // it should either be merged or get // separate names #include -#include "config.h" +#include "pv_config.h" #ifdef FBV_SUPPORT_JPEG #include diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index bb1195aa2..c4751650b 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -1,7 +1,8 @@ +#include "config.h" #include #include #include "pictureviewer.h" -#include "config.h" +#include "pv_config.h" #include "driver/framebuffer.h" diff --git a/src/driver/pictureviewer/png.cpp b/src/driver/pictureviewer/png.cpp index 38a60e664..992158ca0 100644 --- a/src/driver/pictureviewer/png.cpp +++ b/src/driver/pictureviewer/png.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include "pv_config.h" #ifdef FBV_SUPPORT_PNG #include diff --git a/src/driver/pictureviewer/config.h b/src/driver/pictureviewer/pv_config.h similarity index 100% rename from src/driver/pictureviewer/config.h rename to src/driver/pictureviewer/pv_config.h