From b147d374f6e6133a1cba47feffca30f6d2b6fd27 Mon Sep 17 00:00:00 2001
From: Justin Scofield <47263509+scawful@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:12:30 -0500
Subject: [PATCH] CreateSDL_Window rename, avoid macro conflict

---
 src/app/core/controller.cc | 4 ++--
 src/app/core/controller.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/core/controller.cc b/src/app/core/controller.cc
index 2c72751c..0f2a3c1d 100644
--- a/src/app/core/controller.cc
+++ b/src/app/core/controller.cc
@@ -100,7 +100,7 @@ void HandleMouseMovement(int &wheel) {
 bool Controller::IsActive() const { return active_; }
 
 absl::Status Controller::OnEntry() {
-  RETURN_IF_ERROR(CreateWindow())
+  RETURN_IF_ERROR(CreateSDL_Window())
   RETURN_IF_ERROR(CreateRenderer())
   RETURN_IF_ERROR(CreateGuiContext())
   InitializeKeymap();
@@ -167,7 +167,7 @@ void Controller::OnExit() {
   SDL_Quit();
 }
 
-absl::Status Controller::CreateWindow() {
+absl::Status Controller::CreateSDL_Window() {
   if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
     return absl::InternalError(
         absl::StrFormat("SDL_Init: %s\n", SDL_GetError()));
diff --git a/src/app/core/controller.h b/src/app/core/controller.h
index 67914445..4d2f117c 100644
--- a/src/app/core/controller.h
+++ b/src/app/core/controller.h
@@ -37,7 +37,7 @@ class Controller : public ExperimentFlags {
     void operator()(SDL_Texture *p) const { SDL_DestroyTexture(p); }
   };
 
-  absl::Status CreateWindow();
+  absl::Status CreateSDL_Window();
   absl::Status CreateRenderer();
   absl::Status CreateGuiContext();
   absl::Status LoadFontFamilies() const;