diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-08 16:48:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-08 16:48:50 -0500 |
| commit | 561e9becbd1f896c31112ab2dfd56fe7badc9382 (patch) | |
| tree | b3b26964560a5b724999b85e29887582d9898faf /src | |
| parent | fd1c2a13e7558086732288eb1a4f52aef2edeb2f (diff) | |
| parent | 41200b47709bcdaf6f3a66e8453b3d852bd8d2a6 (diff) | |
| download | tor-561e9becbd1f896c31112ab2dfd56fe7badc9382.tar.gz tor-561e9becbd1f896c31112ab2dfd56fe7badc9382.zip | |
Merge remote-tracking branch 'public/signof_enum'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat.h | 3 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index d2944e6f48..fa071e5558 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -136,8 +136,7 @@ extern INLINE double U64_TO_DBL(uint64_t x) { #define DBL_TO_U64(x) ((uint64_t) (x)) #endif -#if defined(_MSC_VER) -/* XXXX024 we should instead have a more general check for "Is enum signed?"*/ +#ifdef ENUM_VALS_ARE_SIGNED #define ENUM_BF(t) unsigned #else /** Wrapper for having a bitfield of an enumerated type. Where possible, we diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 4312d9fbe5..f5d5cf4460 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -256,3 +256,4 @@ #define CURVE25519_ENABLED #define USE_CURVE25519_DONNA +#define ENUM_VALS_ARE_SIGNED 1 |