diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2008-06-09 17:31:22 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2008-06-09 17:31:22 (GMT) |
| commit | 6df2bbd6e93c8731ac5c7a39f32090487b9061f5 (patch) | |
| tree | fdaced2c64e3c5f2428f6ef02022f48f37989905 /hl/tools | |
| parent | 0304c9a5fa3aca4331505e36c939f0347acf0132 (diff) | |
| download | hdf5-6df2bbd6e93c8731ac5c7a39f32090487b9061f5.zip hdf5-6df2bbd6e93c8731ac5c7a39f32090487b9061f5.tar.gz hdf5-6df2bbd6e93c8731ac5c7a39f32090487b9061f5.tar.bz2 | |
[svn-r15181] 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')
| -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 */ |