ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-07 11:50:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/gems/include/gems/vfs_font.h
View File

@ -14,7 +14,7 @@
#ifndef _INCLUDE__GEMS__VFS_FONT_T_ #ifndef _INCLUDE__GEMS__VFS_FONT_T_
#define _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> #include <nitpicker_gfx/text_painter.h>
namespace Genode { class Vfs_font; } namespace Genode { class Vfs_font; }

2
repos/gems/recipes/src/depot_query/content.mk
View File

@ -2,7 +2,7 @@ SRC_DIR := src/app/depot_query
include $(GENODE_DIR)/repos/base/recipes/src/content.inc 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) content: $(MIRROR_FROM_REP_DIR)

2
repos/gems/recipes/src/fs_query/content.mk
View File

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

2
repos/gems/recipes/src/fs_tool/content.mk
View File

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

2
repos/gems/src/app/depot_query/main.cc
View File

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

2
repos/gems/src/app/fs_query/main.cc
View File

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

2
repos/gems/src/app/fs_tool/main.cc
View File

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

2
repos/gems/src/app/menu_view/main.cc
View File

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

2
repos/gems/src/lib/vfs/import/plugin.cc
View File

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

3
repos/gems/src/lib/vfs/trace/vfs.cc
View File

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

2
repos/gems/src/lib/vfs/ttf/vfs.cc
View File

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

2
repos/gems/src/server/terminal/main.cc
View File

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

2
repos/gems/src/test/text_painter/main.cc
View File

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

6
repos/gems/include/gems/vfs.h → repos/os/include/os/vfs.h
View File

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