Commit 5818d548 authored by unknown's avatar unknown
Browse files

Merge changeset 1.2031.1.1 06/01/11 16:18:11 reggie@linux.site into 5.1.5-alpha release clone 


include/config-win.h:
  Merge compile fixes from 5.0 into 5.1.5-alpha release clone.
parent 633d3592

include/config-win.h

+11 −9
Original line number Diff line number Diff line
@@ -108,11 +108,17 @@ functions */ 
#undef _REENTRANT			/* Crashes something for win32 */

#undef SAFE_MUTEX			/* Can't be used on windows */



#define LONGLONG_MIN	((__int64) 0x8000000000000000)

#define LONGLONG_MAX	((__int64) 0x7FFFFFFFFFFFFFFF)

#define ULONGLONG_MAX	((unsigned __int64) 0xFFFFFFFFFFFFFFFF)

#if defined(_MSC_VER) && _MSC_VER >= 1310

#define LL(A)           A##ll

#define ULL(A)          A##ull

#else

#define LL(A)           ((__int64) A)

#define ULL(A)          ((unsigned __int64) A)

#endif



#define LONGLONG_MIN	LL(0x8000000000000000)

#define LONGLONG_MAX	LL(0x7FFFFFFFFFFFFFFF)

#define ULONGLONG_MAX	ULL(0xFFFFFFFFFFFFFFFF)



/* Type information */
@@ -345,11 +351,7 @@ inline double ulonglong2double(ulonglong value) 
#define SPRINTF_RETURNS_INT

#define HAVE_SETFILEPOINTER

#define HAVE_VIO_READ_BUFF



#if defined(_WIN64) && defined(_M_X64)

/* Avoid type conflicts with built-in functions. */

#define HAVE_STRNLEN

#endif



#ifndef __NT__

#undef FILE_SHARE_DELETE