remove min/max definitions
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@718 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
parent
a2865e8901
commit
530af30626
1 changed files with 15 additions and 8 deletions
|
@ -35,15 +35,19 @@
|
|||
// long is 32 bit on 64-bit Windows!
|
||||
// intptr_t used to get 64 bit on Win64
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
|
||||
#define LOKI_SAFEFORMAT_SIGNED_LONG intptr_t
|
||||
#define LOKI_SAFEFORMAT_UNSIGNED_LONG uintptr_t
|
||||
|
||||
# define LOKI_SAFEFORMAT_SIGNED_LONG intptr_t
|
||||
# define LOKI_SAFEFORMAT_UNSIGNED_LONG uintptr_t
|
||||
#else
|
||||
# define LOKI_SAFEFORMAT_SIGNED_LONG signed long
|
||||
# define LOKI_SAFEFORMAT_UNSIGNED_LONG unsigned long
|
||||
#endif
|
||||
|
||||
#define LOKI_SAFEFORMAT_SIGNED_LONG signed long
|
||||
#define LOKI_SAFEFORMAT_UNSIGNED_LONG unsigned long
|
||||
|
||||
// Windows headers could have min/max defined
|
||||
#ifdef max
|
||||
# undef max
|
||||
#endif
|
||||
#ifdef min
|
||||
# undef min
|
||||
#endif
|
||||
|
||||
namespace Loki
|
||||
|
@ -590,6 +594,9 @@ namespace Loki
|
|||
#endif //SAFEFORMAT_H_
|
||||
|
||||
// $Log$
|
||||
// Revision 1.30 2006/10/15 10:25:01 syntheticpp
|
||||
// remove min/max definitions
|
||||
//
|
||||
// Revision 1.29 2006/10/15 09:33:54 syntheticpp
|
||||
// add missing unsigned long overload for Windows
|
||||
//
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue