OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: fix compilation

Browse Source 
this isn't c++ please don't mix declerations with code
This commit is contained in:
Zack Rusin
2011-01-26 21:20:53 -05:00
parent 67c67ee80f
commit 59dbdbbb7d
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/main/extensions.c
View File

@@ -747,6 +747,11 @@ static char *
get_extension_override( struct gl_context *ctx ) get_extension_override( struct gl_context *ctx )
{ {
const char *env_const= _mesa_getenv("MESA_EXTENSION_OVERRIDE"); const char *env_const= _mesa_getenv("MESA_EXTENSION_OVERRIDE");
char *env;
char *ext;
char *extra_exts;
int len;
if (env_const == NULL) { if (env_const == NULL) {
/* Return the empty string rather than NULL. This simplifies the logic /* Return the empty string rather than NULL. This simplifies the logic
* of client functions. */ * of client functions. */
@@ -754,13 +759,13 @@ get_extension_override( struct gl_context *ctx )
} }
/* extra_exts: List of unrecognized extensions. */ /* extra_exts: List of unrecognized extensions. */
char *extra_exts = calloc(strlen(env_const), sizeof(char)); extra_exts = calloc(strlen(env_const), sizeof(char));
/* Copy env_const because strtok() is destructive. */ /* Copy env_const because strtok() is destructive. */
char *env = strdup(env_const); env = strdup(env_const);
char *ext;
for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) { for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) {
int enable; int enable;
int recognized;
switch (ext[0]) { switch (ext[0]) {
case '+': case '+':
enable = 1; enable = 1;
@@ -774,7 +779,7 @@ get_extension_override( struct gl_context *ctx )
enable = 1; enable = 1;
break; break;
} }
int recognized = set_extension(ctx, ext, enable); recognized = set_extension(ctx, ext, enable);
if (!recognized) { if (!recognized) {
strcat(extra_exts, ext); strcat(extra_exts, ext);
strcat(extra_exts, " "); strcat(extra_exts, " ");
@@ -782,7 +787,7 @@ get_extension_override( struct gl_context *ctx )
} }
/* Remove trailing space. */ /* Remove trailing space. */
int len = strlen(extra_exts); len = strlen(extra_exts);
if (extra_exts[len - 1] == ' ') if (extra_exts[len - 1] == ' ')
extra_exts[len - 1] = '\0'; extra_exts[len - 1] = '\0';