7 files changed, 10 insertions, 29 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 53fb9c6e5f9..9cca39e5060 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1090,10 +1090,10 @@ _mesa_initialize_context(struct gl_context *ctx,
    ctx->CurrentDispatch = ctx->OutsideBeginEnd;
 
    ctx->FragmentProgram._MaintainTexEnvProgram
-      = (_mesa_getenv("MESA_TEX_PROG") != NULL);
+      = (getenv("MESA_TEX_PROG") != NULL);
 
    ctx->VertexProgram._MaintainTnlProgram
-      = (_mesa_getenv("MESA_TNL_PROG") != NULL);
+      = (getenv("MESA_TNL_PROG") != NULL);
    if (ctx->VertexProgram._MaintainTnlProgram) {
       /* this is required... */
       ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
@@ -1537,7 +1537,7 @@ handle_first_current(struct gl_context *ctx)
     * first time each context is made current we'll print some useful
     * information.
     */
-   if (_mesa_getenv("MESA_INFO")) {
+   if (getenv("MESA_INFO")) {
       _mesa_print_info(ctx);
    }
 }
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index a5b40b4b560..089ce8987ae 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -215,8 +215,8 @@ set_debug_flags(const char *str)
 void 
 _mesa_init_debug( struct gl_context *ctx )
 {
-   set_debug_flags(_mesa_getenv("MESA_DEBUG"));
-   set_verbose_flags(_mesa_getenv("MESA_VERBOSE"));
+   set_debug_flags(getenv("MESA_DEBUG"));
+   set_verbose_flags(getenv("MESA_VERBOSE"));
 }
 
 
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index 995fc820506..25171f0ee27 100644
--- a/src/mesa/main/errors.c
+++ b/src/mesa/main/errors.c
@@ -1170,7 +1170,7 @@ output_if_debug(const char *prefixString, const char *outputString,
       /* If MESA_LOG_FILE env var is set, log Mesa errors, warnings,
        * etc to the named file.  Otherwise, output to stderr.
        */
-      const char *logFile = _mesa_getenv("MESA_LOG_FILE");
+      const char *logFile = getenv("MESA_LOG_FILE");
       if (logFile)
          fout = fopen(logFile, "w");
       if (!fout)
@@ -1183,7 +1183,7 @@ output_if_debug(const char *prefixString, const char *outputString,
          debug = 1;
 #else
       /* in release builds, be silent unless MESA_DEBUG is set */
-      debug = _mesa_getenv("MESA_DEBUG") != NULL;
+      debug = getenv("MESA_DEBUG") != NULL;
 #endif
    }
 
@@ -1288,7 +1288,7 @@ should_output(struct gl_context *ctx, GLenum error, const char *fmtString)
    /* Check debug environment variable only once:
     */
    if (debug == -1) {
-      const char *debugEnv = _mesa_getenv("MESA_DEBUG");
+      const char *debugEnv = getenv("MESA_DEBUG");
 
 #ifdef DEBUG
       if (debugEnv && strstr(debugEnv, "silent"))
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 43f0e8dd0cc..f0e2f89e494 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -588,7 +588,7 @@ free_unknown_extensions_strings(void)
 void
 _mesa_one_time_init_extension_overrides(void)
 {
-   const char *env_const = _mesa_getenv("MESA_EXTENSION_OVERRIDE");
+   const char *env_const = getenv("MESA_EXTENSION_OVERRIDE");
    char *env;
    char *ext;
    int len;
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 2c5f20d02ec..2c2d11e35ac 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -475,22 +475,6 @@ _mesa_half_to_float(GLhalfARB val)
 
 
 /**********************************************************************/
-/** \name Environment vars */
-/*@{*/
-
-/**
- * Wrapper for getenv().
- */
-char *
-_mesa_getenv( const char *var )
-{
-   return getenv(var);
-}
-
-/*@}*/
-
-
-/**********************************************************************/
 /** \name String */
 /*@{*/
 
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 8f8bcafcc57..4cd2f3f3172 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -535,9 +535,6 @@ _mesa_half_is_negative(GLhalfARB h)
 }
 
 extern char *
-_mesa_getenv( const char *var );
-
-extern char *
 _mesa_strdup( const char *s );
 
 extern float
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index dc8b255d179..30a75191897 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -70,7 +70,7 @@ GLbitfield
 _mesa_get_shader_flags(void)
 {
    GLbitfield flags = 0x0;
-   const char *env = _mesa_getenv("MESA_GLSL");
+   const char *env = getenv("MESA_GLSL");
 
    if (env) {
       if (strstr(env, "dump_on_error"))