diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2010-04-25 21:55:41 +0100 |
|---|---|---|
| committer | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2010-04-28 20:55:04 +0100 |
| commit | e2337f39c3a4ab046b7a572fce89df27451fd2bb (patch) | |
| tree | 796cf9d0a06b922a730ec98984876982c2d5bfd5 /src/bswap.h | |
| parent | fb799dfe77c7a1c9e2806c0021d659b5588d9105 (diff) | |
| download | libgit2-e2337f39c3a4ab046b7a572fce89df27451fd2bb.tar.gz | |
MSVC: Fix a syntax error caused by an inline function definition
Commit 5dddf7c (Add block-sha1 in favour of the mozilla routines
2010-04-14) introduced the "bswap.h" header file which contains
an inline function (default_swab32()). The msvc compiler does
not support the inline keyword which causes the build to fail
with a syntax error.
However, msvc does support inline functions using the __inline
keyword language extension. We already have the GIT_INLINE()
macro that allows us to hide this syntatic difference. In order
to fix the build, we simply use GIT_INLINE() in the definition
of the default_swab32() function.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Diffstat (limited to 'src/bswap.h')
| -rw-r--r-- | src/bswap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bswap.h b/src/bswap.h index 0dac883d0..b3e8a0abb 100644 --- a/src/bswap.h +++ b/src/bswap.h @@ -11,7 +11,7 @@ * Default version that the compiler ought to optimize properly with * constant values. */ -static inline uint32_t default_swab32(uint32_t val) +GIT_INLINE(uint32_t) default_swab32(uint32_t val) { return (((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | |