diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2008-06-09 18:41:29 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2008-06-09 18:41:29 (GMT) |
| commit | 7a92820e35582fc94f0dd46e5039547fddd3d98d (patch) | |
| tree | 4edab170ada903be86940f82c306a2aa738afcb8 /hl/tools/gif2h5 | |
| parent | a97fa671eb16f7b12ed87c46c86501d0282aa364 (diff) | |
| download | hdf5-7a92820e35582fc94f0dd46e5039547fddd3d98d.zip hdf5-7a92820e35582fc94f0dd46e5039547fddd3d98d.tar.gz hdf5-7a92820e35582fc94f0dd46e5039547fddd3d98d.tar.bz2 | |
[svn-r15183] Purpose: _WIN32 macro cleanup
Description:
As part of our Windows cleanup, we try to remove windows-specific tweaks in the source code. There are many instances where Windows code is introduces via ifdef's. We re-evaluate whether they are still required, and found that many of them are not. Others we change to "feature"-specific code, rather than Windows-specific.
Tested:
VS2005 on WinXP
VS.NET on WinXP
h5committest (kagisopp, smirom, linew)
Diffstat (limited to 'hl/tools/gif2h5')
| -rw-r--r-- | hl/tools/gif2h5/hdfgifwr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hl/tools/gif2h5/hdfgifwr.c b/hl/tools/gif2h5/hdfgifwr.c index e6d681a..1771d06 100644 --- a/hl/tools/gif2h5/hdfgifwr.c +++ b/hl/tools/gif2h5/hdfgifwr.c @@ -172,9 +172,9 @@ static unsigned long cur_accum = 0; static int cur_bits = 0; #define MAXCODE(n_bits) ( (1 << (n_bits)) - 1) -#ifndef _WIN32 +#ifndef min #define min(a,b) ((a>b) ? b : a) -#endif +#endif /* min */ #define XV_BITS 12 /* BITS was already defined on some systems */ #define MSDOS 1 #define HSIZE 5003 /* 80% occupancy */ |