diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-04 16:54:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-04 16:54:51 +0200 |
| commit | 23cc74efd16feb2676978b9919a8510ed7804ed9 (patch) | |
| tree | 15324c9a805744a54489f24c95f5eb94a0cc7adf /mesalib/src/glsl/link_functions.cpp | |
| parent | 30aa3aea81afd082cba94028183ac9d5c7c1e123 (diff) | |
| parent | 9b009a8bdb31d08e3d07f68416373b9aa6f85724 (diff) | |
| download | vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.tar.gz vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.tar.bz2 vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/link_functions.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/main.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
xorg-server/composite/compalloc.c
xorg-server/configure.ac
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/bundle/Makefile.am
xorg-server/hw/xquartz/xpr/xprFrame.c
xorg-server/include/windowstr.h
Diffstat (limited to 'mesalib/src/glsl/link_functions.cpp')
| -rw-r--r-- | mesalib/src/glsl/link_functions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/link_functions.cpp b/mesalib/src/glsl/link_functions.cpp index e7713b4bc..b3a701858 100644 --- a/mesalib/src/glsl/link_functions.cpp +++ b/mesalib/src/glsl/link_functions.cpp @@ -91,8 +91,8 @@ public: if (sig == NULL) {
/* FINISHME: Log the full signature of unresolved function.
*/
- linker_error_printf(this->prog, "unresolved reference to function "
- "`%s'\n", name);
+ linker_error(this->prog, "unresolved reference to function `%s'\n",
+ name);
this->success = false;
return visit_stop;
}
|