From 44c2da7f6e6a04be2d3212d556add5b7f042e883 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 5 Sep 2023 12:50:03 +0300
Subject: [PATCH] Use the mspcore version of getenv

---
 source/backends/opengl/device_backend.cpp |  6 ++++--
 source/backends/opengl/extension.cpp      | 11 +++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/source/backends/opengl/device_backend.cpp b/source/backends/opengl/device_backend.cpp
index c13a7f04..1b2ad57a 100644
--- a/source/backends/opengl/device_backend.cpp
+++ b/source/backends/opengl/device_backend.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/environ.h>
 #include <msp/gl/extensions/arb_enhanced_layouts.h>
 #include <msp/gl/extensions/arb_explicit_attrib_location.h>
 #include <msp/gl/extensions/arb_explicit_uniform_location.h>
@@ -47,9 +48,10 @@ void OpenGLDevice::fill_info()
 
 		Version ver(gl_ver.substr(0, gl_ver.find(' ')));
 
-		if(const char *force_ver_ptr = getenv("MSPGL_FORCE_VERSION"))
+		string force_ver_str = getenv("MSPGL_FORCE_VERSION");
+		if(!force_ver_str.empty())
 		{
-			Version force_ver(force_ver_ptr);
+			Version force_ver(force_ver_str);
 			if(force_ver<ver)
 				ver = force_ver;
 		}
diff --git a/source/backends/opengl/extension.cpp b/source/backends/opengl/extension.cpp
index 84f8bd0a..82661c70 100644
--- a/source/backends/opengl/extension.cpp
+++ b/source/backends/opengl/extension.cpp
@@ -8,6 +8,7 @@
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
+#include <msp/core/environ.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "device.h"
@@ -105,9 +106,10 @@ bool is_disabled(const string &ext)
 
 	if(!init_done)
 	{
-		if(const char *disable_ptr = getenv("MSPGL_DISABLE_EXTENSIONS"))
+		string disable_str = getenv("MSPGL_DISABLE_EXTENSIONS");
+		if(!disable_str.empty())
 		{
-			vector<string> disable = split(disable_ptr);
+			vector<string> disable = split(disable_str);
 			disabled_exts.insert(disable.begin(), disable.end());
 		}
 
@@ -164,9 +166,10 @@ inline Version _get_glsl_version()
 
 	Version ver(glsl_ver.substr(0, glsl_ver.find(' ')));
 
-	if(const char *force_ver_ptr = getenv("MSPGL_FORCE_GLSL_VERSION"))
+	string force_ver_str = getenv("MSPGL_FORCE_GLSL_VERSION");
+	if(!force_ver_str.empty())
 	{
-		Version force_ver(force_ver_ptr);
+		Version force_ver(force_ver_str);
 		if(force_ver<ver)
 			ver = force_ver;
 	}
-- 
2.45.2