diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
commit | 270ef59a98d34fef418fb6cd27e46f3edc912948 (patch) | |
tree | 9d363b42d441640e1d2dbff3ba548a2cdf8d67a9 /windows/bitmap.c | |
parent | 21da4f5bdf74c6654730c32dfcc1c6b3d24da4b4 (diff) | |
download | netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.gz netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.bz2 |
Merge jmb/new-cache; r=dsilvers,rs=vince
svn path=/trunk/netsurf/; revision=10180
Diffstat (limited to 'windows/bitmap.c')
-rw-r--r-- | windows/bitmap.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/windows/bitmap.c b/windows/bitmap.c index 74c104963..0fd323574 100644 --- a/windows/bitmap.c +++ b/windows/bitmap.c @@ -19,21 +19,13 @@ #include <inttypes.h> #include <sys/types.h> +#include <string.h> -#include "assert.h" #include "image/bitmap.h" #include "windows/bitmap.h" #include "utils/log.h" -#ifndef MIN -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#ifndef MAX -#define MAX(a,b) (((a) > (b)) ? (a) : (b)) -#endif - /** * Create a bitmap. * |