update main #1

Merged
Sinipelto merged 240 commits from Bananymous/banan-os:main into main 2023-11-20 13:20:51 +02:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit f7097398ca - Show all commits

View File

@ -40,7 +40,7 @@ namespace Kernel
void putchar(uint8_t ch);
virtual void putchar_impl(uint8_t ch) = 0;
bool has_data() const;
virtual bool has_data_impl() const override;
protected:
TTY(mode_t mode, uid_t uid, gid_t gid)

View File

@ -328,7 +328,7 @@ namespace Kernel
return count;
}
bool TTY::has_data() const
bool TTY::has_data_impl() const
{
LockGuard _(m_lock);
return m_output.flush;