summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-05-08 17:06:50 +0200
committerHaru <haru@dotalux.com>2016-05-08 19:53:59 +0200
commit1cca070e1a3b82c33a1aecaa6ec9bfc72516a640 (patch)
tree3001fdbff898a947c7f71119dd8e1cdf9f2a4fe3
parent5cc29c1ec9ae84bf7e39b7a7c4cd4585cb870218 (diff)
downloadhercules-1cca070e1a3b82c33a1aecaa6ec9bfc72516a640.tar.gz
hercules-1cca070e1a3b82c33a1aecaa6ec9bfc72516a640.tar.bz2
hercules-1cca070e1a3b82c33a1aecaa6ec9bfc72516a640.tar.xz
hercules-1cca070e1a3b82c33a1aecaa6ec9bfc72516a640.zip
Removed 'temporary fix for bugreport:4961', no longer necessary
- The provided test cases return success on all currently supported FreeBSD versions (9 and 10) - Fixes #1283
-rw-r--r--src/common/cbasetypes.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 3675d8fa4..0e419c013 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -118,16 +118,6 @@
#include <limits.h>
#include <time.h>
-// temporary fix for bugreport:4961 (unintended conversion from signed to unsigned)
-// (-20 >= UCHAR_MAX) returns true
-// (-20 >= USHRT_MAX) returns true
-#if defined(__FreeBSD__) && defined(__x86_64)
-#undef UCHAR_MAX
-#define UCHAR_MAX ((unsigned char)0xff)
-#undef USHRT_MAX
-#define USHRT_MAX ((unsigned short)0xffff)
-#endif
-
// ILP64 isn't supported, so always 32 bits?
#ifndef UINT_MAX
#define UINT_MAX 0xffffffff