commit 0aecdb638322c81ce30f201f12e1f268acd1a64c
author Kenneth Graunke <kenneth@whitecape.org> Thu Feb 18 23:50:51 2010 -0800
committer Kristian Høgsberg <krh@bitplanet.net> Fri Feb 19 07:47:48 2010 -0500
tree 54f85ea6c8ea24ce5bb5f8b98a82eef46c26df50
parent 71214c640c8b20020ead13897c76b9b6773126ba

Remove _mesa_strstr in favor of plain strstr.

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index e8eaa9c..c3b49ed 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -374,21 +374,21 @@
    const char *env = _mesa_getenv("MESA_GLSL");
 
    if (env) {
-      if (_mesa_strstr(env, "dump"))
+      if (strstr(env, "dump"))
          flags |= GLSL_DUMP;
-      if (_mesa_strstr(env, "log"))
+      if (strstr(env, "log"))
          flags |= GLSL_LOG;
-      if (_mesa_strstr(env, "nopvert"))
+      if (strstr(env, "nopvert"))
          flags |= GLSL_NOP_VERT;
-      if (_mesa_strstr(env, "nopfrag"))
+      if (strstr(env, "nopfrag"))
          flags |= GLSL_NOP_FRAG;
-      if (_mesa_strstr(env, "nopt"))
+      if (strstr(env, "nopt"))
          flags |= GLSL_NO_OPT;
-      else if (_mesa_strstr(env, "opt"))
+      else if (strstr(env, "opt"))
          flags |= GLSL_OPT;
-      if (_mesa_strstr(env, "uniform"))
+      if (strstr(env, "uniform"))
          flags |= GLSL_UNIFORMS;
-      if (_mesa_strstr(env, "useprog"))
+      if (strstr(env, "useprog"))
          flags |= GLSL_USE_PROG;
    }
 

src/mesa/shader/slang/slang_link.c

diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 75b0022..9c90d5c 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -563,7 +563,7 @@
 {
    GLuint verCount = 0;
    while (1) {
-      char *ver = _mesa_strstr(source, "#version");
+      char *ver = strstr(source, "#version");
       if (ver) {
          verCount++;
          if (verCount > 1) {