diff options
| author | Eric Anholt <eric@anholt.net> | 2009-06-02 00:37:19 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-02 00:56:39 -0700 |
| commit | f59f44c140e5f60d336423e0585d2bb8a6c0ea01 (patch) | |
| tree | b0e1369a4aedfb6ee288fd29264177e881021850 /util/cairo-script/cairo-script-scanner.c | |
| parent | 2da78fd4666faa27d037ae3625ca83353a6e7629 (diff) | |
| parent | 4232719af968ed05636fe34f2ffe2520dc02d737 (diff) | |
Merge commit 'origin/master' into gl
Felt like pulling the latest stuff, since I branched back in February.
Conflicts:
build/configure.ac.features
src/cairo.h
util/cairo-script/csi-replay.c
Diffstat (limited to 'util/cairo-script/cairo-script-scanner.c')
| -rw-r--r-- | util/cairo-script/cairo-script-scanner.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/util/cairo-script/cairo-script-scanner.c b/util/cairo-script/cairo-script-scanner.c index c08e447d..22d1721e 100644 --- a/util/cairo-script/cairo-script-scanner.c +++ b/util/cairo-script/cairo-script-scanner.c @@ -34,9 +34,10 @@ #include "cairo-script-private.h" +#include <limits.h> /* INT_MAX */ +#include <math.h> /* pow */ #include <stdio.h> /* EOF */ #include <string.h> /* memset */ -#include <math.h> /* pow */ /* * whitespace: @@ -88,7 +89,7 @@ _csi_buffer_grow (csi_t *ctx, csi_buffer_t *buffer) if (_csi_unlikely (buffer->status)) return buffer->status; - if (_csi_unlikely (buffer->size > INT32_MAX / 2)) + if (_csi_unlikely (buffer->size > INT_MAX / 2)) return buffer->status = _csi_error (CSI_STATUS_NO_MEMORY); offset = buffer->ptr - buffer->base; |