From a8df1e64944c87c4d3ff74e5a56bbeb1a113793e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 12 Feb 2006 22:51:55 +0000 Subject: [PATCH] hopefully fixed build and warnings for bug #142 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16370 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/showimage/BackgroundImage.cpp | 2 +- src/apps/showimage/BackgroundImage.h | 3 ++- src/apps/showimage/ShowImageApp.h | 1 + src/apps/showimage/ShowImageSettings.h | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/apps/showimage/BackgroundImage.cpp b/src/apps/showimage/BackgroundImage.cpp index 2523ba146e..4037ae0795 100644 --- a/src/apps/showimage/BackgroundImage.cpp +++ b/src/apps/showimage/BackgroundImage.cpp @@ -146,7 +146,7 @@ BackgroundImage::_GetImages(BDirectory& directory, BMessage& container) char *buffer = new (nothrow) char [info.size]; if (buffer == NULL) - return NULL; + return B_NO_MEMORY; status = directory.ReadAttr(B_BACKGROUND_INFO, info.type, 0, buffer, (size_t)info.size); diff --git a/src/apps/showimage/BackgroundImage.h b/src/apps/showimage/BackgroundImage.h index d06f0203bd..708c146198 100644 --- a/src/apps/showimage/BackgroundImage.h +++ b/src/apps/showimage/BackgroundImage.h @@ -34,7 +34,8 @@ All rights reserved. #ifndef BACKGROUND_IMAGE_H #define BACKGROUND_IMAGE_H - +#include +#include #include class BDirectory; diff --git a/src/apps/showimage/ShowImageApp.h b/src/apps/showimage/ShowImageApp.h index fd5efe3f84..57e3492ce2 100644 --- a/src/apps/showimage/ShowImageApp.h +++ b/src/apps/showimage/ShowImageApp.h @@ -14,6 +14,7 @@ #include "ShowImageSettings.h" #include +#include class ShowImageApp : public BApplication { diff --git a/src/apps/showimage/ShowImageSettings.h b/src/apps/showimage/ShowImageSettings.h index 3507a9bc6c..f6335dbaed 100644 --- a/src/apps/showimage/ShowImageSettings.h +++ b/src/apps/showimage/ShowImageSettings.h @@ -29,6 +29,7 @@ #ifndef _ShowImageSettings_H #define _ShowImageSettings_H +#include #include #include