summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-02-18 23:50:56 -0800
committerKristian Høgsberg <[email protected]>2010-02-19 07:53:04 -0500
commit8d73aa6d1ae6e89bb2cd8f52f5586d569a4b6eeb (patch)
tree472c6ed63b70b45c1f407b99426cc47619cc18a5 /src/mesa/main
parent21d0c70b4b1c18dc1c3ac7d0fbd8a903d60f8be7 (diff)
Remove _mesa_strcmp in favor of plain strcmp.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/enums.c2
-rw-r--r--src/mesa/main/extensions.c4
-rw-r--r--src/mesa/main/imports.c7
-rw-r--r--src/mesa/main/imports.h3
4 files changed, 3 insertions, 13 deletions
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 1d495b7ae58..fc7f8beb50e 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -5181,7 +5181,7 @@ typedef int (*cfunc)(const void *, const void *);
*/
static int compar_name( const char *a, const enum_elt *b )
{
- return _mesa_strcmp( a, & enum_string_table[ b->offset ] );
+ return strcmp( a, & enum_string_table[ b->offset ] );
}
/**
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 6449f39c7f7..9b0b5f06fc7 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -498,7 +498,7 @@ set_extension( GLcontext *ctx, const char *name, GLboolean state )
}
for (i = 0 ; i < Elements(default_extensions) ; i++) {
- if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
+ if (strcmp(default_extensions[i].name, name) == 0) {
if (default_extensions[i].flag_offset) {
GLboolean *enabled = base + default_extensions[i].flag_offset;
*enabled = state;
@@ -560,7 +560,7 @@ _mesa_extension_is_enabled( GLcontext *ctx, const char *name )
GLuint i;
for (i = 0 ; i < Elements(default_extensions) ; i++) {
- if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
+ if (strcmp(default_extensions[i].name, name) == 0) {
return extension_enabled(ctx, i);
}
}
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index dc24ea0740b..a48f05c5361 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -841,13 +841,6 @@ _mesa_getenv( const char *var )
/** \name String */
/*@{*/
-/** Wrapper around strcmp() */
-int
-_mesa_strcmp( const char *s1, const char *s2 )
-{
- return strcmp(s1, s2);
-}
-
/** Wrapper around strncmp() */
int
_mesa_strncmp( const char *s1, const char *s2, size_t n )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index f66cf0d6f90..867bce763cc 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -612,9 +612,6 @@ extern char *
_mesa_getenv( const char *var );
extern int
-_mesa_strcmp( const char *s1, const char *s2 );
-
-extern int
_mesa_strncmp( const char *s1, const char *s2, size_t n );
extern char *