diff options
| author | Jordan Justen <[email protected]> | 2012-11-30 16:32:11 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2012-12-07 14:46:18 -0800 |
| commit | 59284bc44a3f30ec18192098a4e1e43b6c6d392a (patch) | |
| tree | 3b329722485258ba74640f31bdbe8830b51d4488 /src/mesa | |
| parent | 970ec8dbc3491615964808ce1563d34d08e806cb (diff) | |
program/hash_table.c: rename to program/prog_hash_table.c
Removes a collision of the object file name for main/hash_table
and program/hash_table.
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Android.libmesa_glsl_utils.mk | 4 | ||||
| -rw-r--r-- | src/mesa/SConscript | 2 | ||||
| -rw-r--r-- | src/mesa/program/prog_hash_table.c (renamed from src/mesa/program/hash_table.c) | 0 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk index 4802757955f..5ae946fd8dc 100644 --- a/src/mesa/Android.libmesa_glsl_utils.mk +++ b/src/mesa/Android.libmesa_glsl_utils.mk @@ -36,7 +36,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmesa_glsl_utils LOCAL_SRC_FILES := \ - program/hash_table.c \ + program/prog_hash_table.c \ program/symbol_table.c include $(MESA_COMMON_MK) @@ -52,7 +52,7 @@ LOCAL_MODULE := libmesa_glsl_utils LOCAL_IS_HOST_MODULE := true LOCAL_SRC_FILES := \ - program/hash_table.c \ + program/prog_hash_table.c \ program/symbol_table.c include $(MESA_COMMON_MK) diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 0b4dd7e381e..a2492f7716f 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -294,7 +294,7 @@ env.Append(CPPPATH = [Dir('.').abspath]) program_sources = [ 'program/arbprogparse.c', - 'program/hash_table.c', + 'program/prog_hash_table.c', 'program/ir_to_mesa.cpp', 'program/program.c', 'program/program_parse_extra.c', diff --git a/src/mesa/program/hash_table.c b/src/mesa/program/prog_hash_table.c index f45ed46afad..f45ed46afad 100644 --- a/src/mesa/program/hash_table.c +++ b/src/mesa/program/prog_hash_table.c diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 86aa31dac17..8cde2c4cf6d 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -248,7 +248,7 @@ STATETRACKER_FILES = \ PROGRAM_FILES = \ $(SRCDIR)program/arbprogparse.c \ - $(SRCDIR)program/hash_table.c \ + $(SRCDIR)program/prog_hash_table.c \ $(SRCDIR)program/ir_to_mesa.cpp \ $(SRCDIR)program/program.c \ $(SRCDIR)program/program_parse_extra.c \ |