From 35e1135b11268cce3eef46af58f4166ebaaff62f Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 28 Nov 2010 22:00:58 +0000 Subject: [PATCH] fix necessary for out-of-source build git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@912 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/435807a491c27bfc42e96b9181f80aa0e7e470e1 Author: Stefan Seyfried Date: 2010-11-28 (Sun, 28 Nov 2010) Origin message was: ------------------ - fix necessary for out-of-source build git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@912 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/driver/pictureviewer/jpeg.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/driver/pictureviewer/jpeg.cpp b/src/driver/pictureviewer/jpeg.cpp index 00fe97ff0..db7ac2fa2 100644 --- a/src/driver/pictureviewer/jpeg.cpp +++ b/src/driver/pictureviewer/jpeg.cpp @@ -1,4 +1,7 @@ -#include "../../../config.h" +// first includes global, second local config.h +// it should either be merged or get +// separate names +#include #include "config.h" #ifdef FBV_SUPPORT_JPEG