diff options
author | Marcus Brinkmann <mb@g10code.com> | 2006-07-04 13:06:04 +0000 |
---|---|---|
committer | Marcus Brinkmann <mb@g10code.com> | 2006-07-04 13:06:04 +0000 |
commit | 552f4bb485eceedf485a8fbd41895e966fab889c (patch) | |
tree | 7769c4683572d21e99384f4e089a60da98346185 /src/types.h | |
parent | 46eaf1466294f5141055e91088dbde7e4dbab28b (diff) | |
download | libgcrypt-552f4bb485eceedf485a8fbd41895e966fab889c.tar.gz |
2006-07-04 Marcus Brinkmann <marcus@g10code.de>
* ath.c: Avoid warning about double defined type byte and other
hacks to let it build for W32 (backported from LIBGCRYPT-1-2-BRANCH).
* ath.h, gcrypt.h, tests/benchmark.c, src/types.h: Likewise.
Diffstat (limited to 'src/types.h')
-rw-r--r-- | src/types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/types.h b/src/types.h index c3a9d938..ee0a62bb 100644 --- a/src/types.h +++ b/src/types.h @@ -43,7 +43,11 @@ #ifndef HAVE_BYTE_TYPEDEF #undef byte /* maybe there is a macro with this name */ +/* Windows typedefs byte in the rpc headers. Avoid warning about + double definition. */ +#if !(defined(_WIN32) && defined(cbNDRContext)) typedef unsigned char byte; +#endif #define HAVE_BYTE_TYPEDEF #endif |