diff options
author | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
commit | d79e641dea89c0d5d651b11971c4c9e14df34629 (patch) | |
tree | 59d636ef9c4c21906ea28ac719589f25b9794d0a /mesalib/src/glsl/ir_function_detect_recursion.cpp | |
parent | bf59764a4685c4bef029eddfa75d7496d2a91ae0 (diff) | |
parent | c6f80401dc533b04341afe8d596960d1bc25efce (diff) | |
download | vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.gz vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.bz2 vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/log.c
Diffstat (limited to 'mesalib/src/glsl/ir_function_detect_recursion.cpp')
-rw-r--r-- | mesalib/src/glsl/ir_function_detect_recursion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir_function_detect_recursion.cpp b/mesalib/src/glsl/ir_function_detect_recursion.cpp index 890bc455f..0a5e647cd 100644 --- a/mesalib/src/glsl/ir_function_detect_recursion.cpp +++ b/mesalib/src/glsl/ir_function_detect_recursion.cpp @@ -217,7 +217,7 @@ public: if (this->current == NULL) return visit_continue; - function *const target = this->get_function(call->get_callee()); + function *const target = this->get_function(call->callee); /* Create a link from the caller to the callee. */ |