|  | @@ -222,7 +222,8 @@ typedef long off_t;
 | 
	
		
			
				|  |  |  /* Visual Studio 6 does not know __func__ or __FUNCTION__
 | 
	
		
			
				|  |  |   * The rest of MS compilers use __FUNCTION__, not C99 __func__
 | 
	
		
			
				|  |  |   * Also use _strtoui64 on modern M$ compilers */
 | 
	
		
			
				|  |  | -#if defined(_MSC_VER) && (_MSC_VER < 1300)
 | 
	
		
			
				|  |  | +#if defined(_MSC_VER)
 | 
	
		
			
				|  |  | +#if (_MSC_VER < 1300)
 | 
	
		
			
				|  |  |  #define STRX(x) #x
 | 
	
		
			
				|  |  |  #define STR(x) STRX(x)
 | 
	
		
			
				|  |  |  #define __func__ __FILE__ ":" STR(__LINE__)
 | 
	
	
		
			
				|  | @@ -232,6 +233,7 @@ typedef long off_t;
 | 
	
		
			
				|  |  |  #define __func__ __FUNCTION__
 | 
	
		
			
				|  |  |  #define strtoull(x, y, z) (_strtoui64(x, y, z))
 | 
	
		
			
				|  |  |  #define strtoll(x, y, z) (_strtoi64(x, y, z))
 | 
	
		
			
				|  |  | +#endif
 | 
	
		
			
				|  |  |  #endif /* _MSC_VER */
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  #define ERRNO (GetLastError())
 |