Move include/gems/vfs.h to include/os/vfs.h

Fixes #3515
This commit is contained in:
Norman Feske 2019-10-07 17:18:15 +02:00 committed by Christian Helmuth
parent a8dd7dd2fa
commit c85bc38802
14 changed files with 14 additions and 19 deletions

View File

@ -14,7 +14,7 @@
#ifndef _INCLUDE__GEMS__VFS_FONT_T_
#define _INCLUDE__GEMS__VFS_FONT_T_
#include <gems/vfs.h>
#include <os/vfs.h>
#include <nitpicker_gfx/text_painter.h>
namespace Genode { class Vfs_font; }

View File

@ -2,7 +2,7 @@ SRC_DIR := src/app/depot_query
include $(GENODE_DIR)/repos/base/recipes/src/content.inc
MIRROR_FROM_REP_DIR := include/depot include/gems/vfs.h include/gems/lru_cache.h
MIRROR_FROM_REP_DIR := include/depot include/gems/lru_cache.h
content: $(MIRROR_FROM_REP_DIR)

View File

@ -2,8 +2,6 @@ SRC_DIR := src/app/fs_query
include $(GENODE_DIR)/repos/base/recipes/src/content.inc
MIRROR_FROM_REP_DIR := include/gems/vfs.h
content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):

View File

@ -2,8 +2,6 @@ SRC_DIR := src/app/fs_tool
include $(GENODE_DIR)/repos/base/recipes/src/content.inc
MIRROR_FROM_REP_DIR := include/gems/vfs.h
content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):

View File

@ -16,7 +16,7 @@
#include <base/heap.h>
#include <base/attached_rom_dataspace.h>
#include <os/reporter.h>
#include <gems/vfs.h>
#include <os/vfs.h>
#include <depot/archive.h>
#include <gems/lru_cache.h>

View File

@ -17,7 +17,7 @@
#include <base/heap.h>
#include <base/attached_rom_dataspace.h>
#include <os/reporter.h>
#include <gems/vfs.h>
#include <os/vfs.h>
namespace Fs_query {
using namespace Genode;

View File

@ -16,7 +16,7 @@
#include <base/sleep.h>
#include <base/attached_rom_dataspace.h>
#include <base/heap.h>
#include <gems/vfs.h>
#include <os/vfs.h>
namespace Fs_tool {
using namespace Genode;

View File

@ -25,10 +25,10 @@
#include <input/event.h>
#include <os/reporter.h>
#include <timer_session/connection.h>
#include <os/vfs.h>
/* gems includes */
#include <gems/nitpicker_buffer.h>
#include <gems/vfs.h>
namespace Menu_view { struct Main; }

View File

@ -11,7 +11,7 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#include <gems/vfs.h>
#include <os/vfs.h>
#include <vfs/print.h>
#include <base/heap.h>

View File

@ -15,8 +15,7 @@
#include <vfs/dir_file_system.h>
#include <vfs/single_file_system.h>
#include <gems/vfs.h>
#include <os/vfs.h>
#include <util/xml_generator.h>
#include <trace_session/connection.h>

View File

@ -14,10 +14,10 @@
/* Genode includes */
#include <vfs/dir_file_system.h>
#include <vfs/readonly_value_file_system.h>
#include <os/vfs.h>
/* gems includes */
#include <gems/ttf_font.h>
#include <gems/vfs.h>
#include <gems/cached_font.h>
/* local includes */

View File

@ -22,7 +22,7 @@
#include <base/attached_ram_dataspace.h>
#include <input/event.h>
#include <os/reporter.h>
#include <gems/vfs.h>
#include <os/vfs.h>
#include <gems/vfs_font.h>
#include <gems/cached_font.h>

View File

@ -23,10 +23,10 @@
#include <nitpicker_gfx/box_painter.h>
#include <util/bezier.h>
#include <timer_session/connection.h>
#include <os/vfs.h>
/* gems includes */
#include <gems/ttf_font.h>
#include <gems/vfs.h>
#include <gems/vfs_font.h>
#include <gems/cached_font.h>

View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__GEMS__VFS_H_
#define _INCLUDE__GEMS__VFS_H_
#ifndef _INCLUDE__OS__VFS_H_
#define _INCLUDE__OS__VFS_H_
/* Genode includes */
#include <base/env.h>
@ -619,4 +619,4 @@ class Genode::Watch_handler : public Vfs::Watch_response_handler,
void watch_response() override { (_obj.*_member)(); }
};
#endif /* _INCLUDE__GEMS__VFS_H_ */
#endif /* _INCLUDE__OS__VFS_H_ */