diff --git a/AK/LogStream.cpp b/AK/LogStream.cpp index 912c90b412f579..16f32d489498d0 100644 --- a/AK/LogStream.cpp +++ b/AK/LogStream.cpp @@ -36,7 +36,7 @@ const LogStream& operator<<(const LogStream& stream, const void* value) return stream << String::format("%p", value); } -#ifdef USERLAND +#if defined (__serenity__) && !defined(KERNEL) static TriState got_process_name = TriState::Unknown; static char process_name_buffer[256]; #endif @@ -44,7 +44,7 @@ static char process_name_buffer[256]; DebugLogStream dbg() { DebugLogStream stream; -#ifdef USERLAND +#if defined (__serenity__) && !defined(KERNEL) if (got_process_name == TriState::Unknown) { if (get_process_name(process_name_buffer, sizeof(process_name_buffer)) == 0) got_process_name = TriState::True; diff --git a/AK/LogStream.h b/AK/LogStream.h index fd311523a36074..e18e3fef5a8d92 100644 --- a/AK/LogStream.h +++ b/AK/LogStream.h @@ -3,7 +3,7 @@ #include #include -#ifdef USERLAND +#ifndef KERNEL # include # include # include @@ -18,7 +18,7 @@ class StringView; class LogStream { public: LogStream() -#ifdef USERLAND +#ifndef KERNEL : m_errno_restorer(errno) #endif { @@ -28,7 +28,7 @@ class LogStream { virtual void write(const char*, int) const = 0; private: -#ifdef USERLAND +#ifndef KERNEL ScopedValueRollback m_errno_restorer; #endif }; diff --git a/Kernel/kstdio.h b/Kernel/kstdio.h index 9a5a91d27f33ab..34e745a5dc240e 100644 --- a/Kernel/kstdio.h +++ b/Kernel/kstdio.h @@ -11,7 +11,7 @@ void set_serial_debug(bool on_or_off); int get_serial_debug(); } -#ifndef USERLAND +#ifdef KERNEL # define printf dbgprintf #endif diff --git a/Makefile.common b/Makefile.common index 804a5760444026..59a8483db9c2a0 100644 --- a/Makefile.common +++ b/Makefile.common @@ -54,8 +54,6 @@ else ifdef KERNEL DEFINES += -DKERNEL - else - DEFINES += -DUSERLAND endif OBJ_SUFFIX ?=