3 files changed, 4 insertions, 4 deletions
diff --git a/src/util/os_memory.h b/src/util/os_memory.h
index 46a6b6e4572..7a40ba9e608 100644
--- a/src/util/os_memory.h
+++ b/src/util/os_memory.h
@@ -39,7 +39,7 @@
 #include "pipe/p_compiler.h"
 
 
-#if defined(PIPE_SUBSYSTEM_EMBEDDED)
+#if defined(EMBEDDED_DEVICE)
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/util/os_misc.c b/src/util/os_misc.c
index e9a727c54d6..3a1e7eaddab 100644
--- a/src/util/os_misc.c
+++ b/src/util/os_misc.c
@@ -107,13 +107,13 @@ os_log_message(const char *message)
 }
 
 
-#if !defined(PIPE_SUBSYSTEM_EMBEDDED)
+#if !defined(EMBEDDED_DEVICE)
 const char *
 os_get_option(const char *name)
 {
    return getenv(name);
 }
-#endif /* !PIPE_SUBSYSTEM_EMBEDDED */
+#endif /* !EMBEDDED_DEVICE */
 
 
 /**
diff --git a/src/util/u_debug.c b/src/util/u_debug.c
index 421ae95227b..b27bf7c5480 100644
--- a/src/util/u_debug.c
+++ b/src/util/u_debug.c
@@ -51,7 +51,7 @@ void
 _debug_vprintf(const char *format, va_list ap)
 {
    static char buf[4096] = {'\0'};
-#if defined(PIPE_OS_WINDOWS) || defined(PIPE_SUBSYSTEM_EMBEDDED)
+#if defined(PIPE_OS_WINDOWS) || defined(EMBEDDED_DEVICE)
    /* We buffer until we find a newline. */
    size_t len = strlen(buf);
    int ret = vsnprintf(buf + len, sizeof(buf) - len, format, ap);