diff options
| author | Christian König <[email protected]> | 2010-12-22 21:12:24 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-12-22 21:12:24 +0100 |
| commit | e179a8bf34022c200deee92d328cb1bae3c3aa4a (patch) | |
| tree | 4c67616380e7c0efa2d7ff0fe67fd18af2fa11ad /src/glsl/s_expression.cpp | |
| parent | 1b03996b1269fb8b2f89e0a013d8427da660ff83 (diff) | |
| parent | 38c8b034e2775640c588711290c244632dcc2475 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/glsl/s_expression.cpp')
| -rw-r--r-- | src/glsl/s_expression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/s_expression.cpp b/src/glsl/s_expression.cpp index 4c8829fea9a..e420cd6e7ec 100644 --- a/src/glsl/s_expression.cpp +++ b/src/glsl/s_expression.cpp @@ -62,7 +62,7 @@ read_atom(void *ctx, const char *& src) // Check if the atom is a number. char *float_end = NULL; - double f = strtod(src, &float_end); + double f = glsl_strtod(src, &float_end); if (float_end != src) { char *int_end = NULL; int i = strtol(src, &int_end, 10); |