few small fixes to get ramfs slightly closer to compiling again; <new> 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
This commit is contained in:
@@ -134,7 +134,7 @@ void
|
|||||||
BlockHeader::SetPreviousBlock(Block *block)
|
BlockHeader::SetPreviousBlock(Block *block)
|
||||||
{
|
{
|
||||||
size_t offset = (block ? (char*)this - (char*)block : 0);
|
size_t offset = (block ? (char*)this - (char*)block : 0);
|
||||||
fBackSkip = fBackSkip & FREE_FLAG | offset;
|
fBackSkip = (fBackSkip & FREE_FLAG) | offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetPreviousBlock
|
// GetPreviousBlock
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
#ifndef LIST_H
|
#ifndef LIST_H
|
||||||
#define LIST_H
|
#define LIST_H
|
||||||
|
|
||||||
#include <new.h>
|
#include <new>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public:
|
|||||||
// stat data
|
// stat data
|
||||||
|
|
||||||
inline void SetMode(mode_t mode)
|
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 mode_t GetMode() const { return fMode; }
|
||||||
|
|
||||||
inline void SetUID(uid_t uid) { fUID = uid; MarkModified(B_STAT_UID); }
|
inline void SetUID(uid_t uid) { fUID = uid; MarkModified(B_STAT_UID); }
|
||||||
|
|||||||
Reference in New Issue
Block a user