diff options
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/my_global.h b/include/my_global.h index 4f318988330..8940c453573 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -566,18 +566,14 @@ int __void__; #define LINT_INIT(var) #endif +#include <my_valgrind.h> + #if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(HAVE_valgrind) #define VALGRIND_OR_LINT_INIT(var) var=0 #else #define VALGRIND_OR_LINT_INIT(var) #endif -#ifdef HAVE_valgrind -#define IF_VALGRIND(A,B) (A) -#else -#define IF_VALGRIND(A,B) (B) -#endif - #ifdef _WIN32 #define SO_EXT ".dll" #elif defined(__APPLE__) @@ -780,7 +776,7 @@ typedef SOCKET_SIZE_TYPE size_socket; #endif #define MY_NFILE 64 /* This is only used to save filenames */ #ifndef OS_FILE_LIMIT -#define OS_FILE_LIMIT 65535 +#define OS_FILE_LIMIT UINT_MAX #endif /* #define EXT_IN_LIBNAME */ |