diff options
| author | Nian Wu <nian@graphics.(none)> | 2007-02-25 09:40:28 -0800 |
|---|---|---|
| committer | Nian Wu <nian@graphics.(none)> | 2007-02-25 09:40:28 -0800 |
| commit | 675f7f627bec92315bf168a9c872ffc05f88c69c (patch) | |
| tree | 19c8f9cc509dc7ce73a0709832f34bf13a2c7425 /src/mesa/shader/slang | |
| parent | 51bfb8fc8c78bb066d24e6ecbc20f00af7210386 (diff) | |
| parent | c080123998f28d9317331aec7ddfcd1074b29daf (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa/shader/slang')
| -rw-r--r-- | src/mesa/shader/slang/slang_execute.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/slang_execute.c b/src/mesa/shader/slang/slang_execute.c index e469de0207..3ffa4b88bf 100644 --- a/src/mesa/shader/slang/slang_execute.c +++ b/src/mesa/shader/slang/slang_execute.c @@ -328,7 +328,7 @@ static GLvoid ensure_infolog_created(slang_info_log ** infolog) { if (*infolog == NULL) { - *infolog = slang_alloc_malloc(sizeof(slang_info_log)); + *infolog = (slang_info_log *) slang_alloc_malloc(sizeof(slang_info_log)); if (*infolog == NULL) return; slang_info_log_construct(*infolog); |