i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build under Dano (and probably Zeta, too); our headers used entry_ref resp.

Browse Source 
BDirectory without declaring it first. Since that's an actual bug, I made the
changes in the Haiku headers, and copied them back to the build headers.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21562 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-07-04 23:20:05 +00:00
parent c913d07f6d
commit f9d99406ae
4 changed files with 20 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/build/os/app/Message.h
+2
View File
@@ -8,6 +8,7 @@
#ifndef _MESSAGE_H #ifndef _MESSAGE_H
#define _MESSAGE_H #define _MESSAGE_H
#include <BeBuild.h> #include <BeBuild.h>
#include <DataIO.h> #include <DataIO.h>
#include <Flattenable.h> #include <Flattenable.h>
@@ -21,6 +22,7 @@ class BBlockCache;
class BMessenger; class BMessenger;
class BHandler; class BHandler;
class BString; class BString;
struct entry_ref;
// Name lengths and Scripting specifiers // Name lengths and Scripting specifiers
headers/build/os/storage/Node.h
+8 -31
View File
@@ -1,24 +1,14 @@
//---------------------------------------------------------------------- /*
// This software is part of the OpenBeOS distribution and is covered * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
// by the OpenBeOS license. * Distributed under the terms of the MIT License.
//--------------------------------------------------------------------- */
/*!
\file Node.h
BNode and node_ref interface declarations.
*/
#ifndef _NODE_H #ifndef _NODE_H
#define _NODE_H #define _NODE_H
#include <Statable.h> #include <Statable.h>
#ifdef USE_OPENBEOS_NAMESPACE class BDirectory;
namespace OpenBeOS {
#endif
//---------------------------------------------------------------
// node_ref
//---------------------------------------------------------------
//! Reference structure to a particular vnode on a particular device //! Reference structure to a particular vnode on a particular device
/*! <b>node_ref</b> - A node reference. /*! <b>node_ref</b> - A node reference.
@@ -30,7 +20,7 @@ namespace OpenBeOS {
struct node_ref { struct node_ref {
node_ref(); node_ref();
node_ref(const node_ref &ref); node_ref(const node_ref &ref);
bool operator==(const node_ref &ref) const; bool operator==(const node_ref &ref) const;
bool operator!=(const node_ref &ref) const; bool operator!=(const node_ref &ref) const;
node_ref& operator=(const node_ref &ref); node_ref& operator=(const node_ref &ref);
@@ -40,16 +30,12 @@ struct node_ref {
return (device < ref.device return (device < ref.device
|| device == ref.device && node < ref.node); || device == ref.device && node < ref.node);
} }
dev_t device; dev_t device;
ino_t node; ino_t node;
}; };
//---------------------------------------------------------------
// BNode
//---------------------------------------------------------------
//! A BNode represents a chunk of data in the filesystem. //! A BNode represents a chunk of data in the filesystem.
/*! The BNode class provides an interface for manipulating the data and attributes /*! The BNode class provides an interface for manipulating the data and attributes
belonging to filesystem entries. The BNode is unaware of the name that refers belonging to filesystem entries. The BNode is unaware of the name that refers
@@ -63,7 +49,6 @@ struct node_ref {
*/ */
class BNode : public BStatable { class BNode : public BStatable {
public: public:
BNode(); BNode();
BNode(const entry_ref *ref); BNode(const entry_ref *ref);
BNode(const BEntry *entry); BNode(const BEntry *entry);
@@ -136,12 +121,4 @@ private:
status_t InitAttrDir(); status_t InitAttrDir();
}; };
#ifdef USE_OPENBEOS_NAMESPACE
}; // namespace OpenBeOS
#endif
#endif // _NODE_H #endif // _NODE_H
headers/os/app/Message.h
+2
View File
@@ -8,6 +8,7 @@
#ifndef _MESSAGE_H #ifndef _MESSAGE_H
#define _MESSAGE_H #define _MESSAGE_H
#include <BeBuild.h> #include <BeBuild.h>
#include <DataIO.h> #include <DataIO.h>
#include <Flattenable.h> #include <Flattenable.h>
@@ -21,6 +22,7 @@ class BBlockCache;
class BMessenger; class BMessenger;
class BHandler; class BHandler;
class BString; class BString;
struct entry_ref;
// Name lengths and Scripting specifiers // Name lengths and Scripting specifiers
headers/os/storage/Node.h
+8 -31
View File
@@ -1,24 +1,14 @@
//---------------------------------------------------------------------- /*
// This software is part of the OpenBeOS distribution and is covered * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
// by the OpenBeOS license. * Distributed under the terms of the MIT License.
//--------------------------------------------------------------------- */
/*!
\file Node.h
BNode and node_ref interface declarations.
*/
#ifndef _NODE_H #ifndef _NODE_H
#define _NODE_H #define _NODE_H
#include <Statable.h> #include <Statable.h>
#ifdef USE_OPENBEOS_NAMESPACE class BDirectory;
namespace OpenBeOS {
#endif
//---------------------------------------------------------------
// node_ref
//---------------------------------------------------------------
//! Reference structure to a particular vnode on a particular device //! Reference structure to a particular vnode on a particular device
/*! <b>node_ref</b> - A node reference. /*! <b>node_ref</b> - A node reference.
@@ -30,20 +20,16 @@ namespace OpenBeOS {
struct node_ref { struct node_ref {
node_ref(); node_ref();
node_ref(const node_ref &ref); node_ref(const node_ref &ref);
bool operator==(const node_ref &ref) const; bool operator==(const node_ref &ref) const;
bool operator!=(const node_ref &ref) const; bool operator!=(const node_ref &ref) const;
node_ref& operator=(const node_ref &ref); node_ref& operator=(const node_ref &ref);
dev_t device; dev_t device;
ino_t node; ino_t node;
}; };
//---------------------------------------------------------------
// BNode
//---------------------------------------------------------------
//! A BNode represents a chunk of data in the filesystem. //! A BNode represents a chunk of data in the filesystem.
/*! The BNode class provides an interface for manipulating the data and attributes /*! The BNode class provides an interface for manipulating the data and attributes
belonging to filesystem entries. The BNode is unaware of the name that refers belonging to filesystem entries. The BNode is unaware of the name that refers
@@ -57,7 +43,6 @@ struct node_ref {
*/ */
class BNode : public BStatable { class BNode : public BStatable {
public: public:
BNode(); BNode();
BNode(const entry_ref *ref); BNode(const entry_ref *ref);
BNode(const BEntry *entry); BNode(const BEntry *entry);
@@ -130,12 +115,4 @@ private:
status_t InitAttrDir(); status_t InitAttrDir();
}; };
#ifdef USE_OPENBEOS_NAMESPACE
}; // namespace OpenBeOS
#endif
#endif // _NODE_H #endif // _NODE_H