From 93344365ca21d2848b975dcceb0f953530aa2956 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 3 Jun 2011 23:03:10 +0000 Subject: [PATCH] few small fixes to get ramfs slightly closer to compiling again; is for you; add parentheses to avoid gcc warnings git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41897 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/ramfs/Block.h | 2 +- src/add-ons/kernel/file_systems/ramfs/List.h | 2 +- src/add-ons/kernel/file_systems/ramfs/Node.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/file_systems/ramfs/Block.h b/src/add-ons/kernel/file_systems/ramfs/Block.h index 091c994e40..1443f8de27 100644 --- a/src/add-ons/kernel/file_systems/ramfs/Block.h +++ b/src/add-ons/kernel/file_systems/ramfs/Block.h @@ -134,7 +134,7 @@ void BlockHeader::SetPreviousBlock(Block *block) { size_t offset = (block ? (char*)this - (char*)block : 0); - fBackSkip = fBackSkip & FREE_FLAG | offset; + fBackSkip = (fBackSkip & FREE_FLAG) | offset; } // GetPreviousBlock diff --git a/src/add-ons/kernel/file_systems/ramfs/List.h b/src/add-ons/kernel/file_systems/ramfs/List.h index 710ea25c70..952e0d453d 100644 --- a/src/add-ons/kernel/file_systems/ramfs/List.h +++ b/src/add-ons/kernel/file_systems/ramfs/List.h @@ -28,7 +28,7 @@ #ifndef LIST_H #define LIST_H -#include +#include #include #include diff --git a/src/add-ons/kernel/file_systems/ramfs/Node.h b/src/add-ons/kernel/file_systems/ramfs/Node.h index 01e0c4d58b..5c4ada2ac7 100644 --- a/src/add-ons/kernel/file_systems/ramfs/Node.h +++ b/src/add-ons/kernel/file_systems/ramfs/Node.h @@ -58,7 +58,7 @@ public: // stat data inline void SetMode(mode_t mode) - { fMode = fMode & ~S_IUMSK | mode & S_IUMSK; } + { fMode = (fMode & ~S_IUMSK) | (mode & S_IUMSK); } inline mode_t GetMode() const { return fMode; } inline void SetUID(uid_t uid) { fUID = uid; MarkModified(B_STAT_UID); }