summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Terriberry <tterribe@xiph.org>2010-06-10 13:42:06 +0000
committerTim Terriberry <tterribe@xiph.org>2010-06-10 13:42:06 +0000
commit6e1740c2921c9d37342b107b7de9951258dd0dc0 (patch)
tree6933d1671a8404beac3d0de139c92f3a87fa72c3 /src
parente73a2c97ab7700410badbe1090e2cb0456c062c8 (diff)
downloadogg-git-6e1740c2921c9d37342b107b7de9951258dd0dc0.tar.gz
The generic TYPE_MAX macros introduced in r17270 require the gcc typeof
extension, which is not supported by MSVC. We don't actually need that generality, though, so revert to simply using LONG_MAX instead. svn path=/trunk/ogg/; revision=17287
Diffstat (limited to 'src')
-rw-r--r--src/bitwise.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bitwise.c b/src/bitwise.c
index 7a57f55..a3593e4 100644
--- a/src/bitwise.c
+++ b/src/bitwise.c
@@ -20,6 +20,7 @@
#include <string.h>
#include <stdlib.h>
+#include <limits.h>
#include <ogg/ogg.h>
#define BUFFER_INCREMENT 256
@@ -84,7 +85,7 @@ void oggpack_write(oggpack_buffer *b,unsigned long value,int bits){
if(b->endbyte>=b->storage-4){
void *ret;
if(!b->ptr)return;
- if(b->storage>TYPE_MAX(b->storage)-BUFFER_INCREMENT) goto err;
+ if(b->storage>LONG_MAX-BUFFER_INCREMENT) goto err;
ret=_ogg_realloc(b->buffer,b->storage+BUFFER_INCREMENT);
if(!ret) goto err;
b->buffer=ret;
@@ -127,7 +128,7 @@ void oggpackB_write(oggpack_buffer *b,unsigned long value,int bits){
if(b->endbyte>=b->storage-4){
void *ret;
if(!b->ptr)return;
- if(b->storage>TYPE_MAX(b->storage)-BUFFER_INCREMENT) goto err;
+ if(b->storage>LONG_MAX-BUFFER_INCREMENT) goto err;
ret=_ogg_realloc(b->buffer,b->storage+BUFFER_INCREMENT);
if(!ret) goto err;
b->buffer=ret;