mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 19:34:08 +00:00 
			
		
		
		
	Repair idiot typo, and complete the job of trying to
use the Windows time.clock() implementation on Win64.
This commit is contained in:
		
							parent
							
								
									4c803f1c81
								
							
						
					
					
						commit
						c285e62d76
					
				
					 1 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -64,8 +64,8 @@ static long main_thread;
 | 
			
		|||
#endif /* !__WATCOMC__ || __QNX__ */
 | 
			
		||||
 | 
			
		||||
#if defined(MS_WINDOWS) && !defined(__BORLANDC__)
 | 
			
		||||
/* Win32 has better clock replacement
 | 
			
		||||
#undef HAVE_CLOCK /* We have our own version down below */
 | 
			
		||||
/* Win32 has better clock replacement; we have our own version below. */
 | 
			
		||||
#undef HAVE_CLOCK
 | 
			
		||||
#endif /* MS_WINDOWS && !defined(__BORLANDC__) */
 | 
			
		||||
 | 
			
		||||
#if defined(PYOS_OS2)
 | 
			
		||||
| 
						 | 
				
			
			@ -161,7 +161,7 @@ time_clock(PyObject *self, PyObject *args)
 | 
			
		|||
}
 | 
			
		||||
#endif /* HAVE_CLOCK */
 | 
			
		||||
 | 
			
		||||
#if defined(MS_WINDOWS) && !defined(MS_WIN64) && !defined(__BORLANDC__)
 | 
			
		||||
#if defined(MS_WINDOWS) && !defined(__BORLANDC__)
 | 
			
		||||
/* Due to Mark Hammond and Tim Peters */
 | 
			
		||||
static PyObject *
 | 
			
		||||
time_clock(PyObject *self, PyObject *args)
 | 
			
		||||
| 
						 | 
				
			
			@ -190,7 +190,7 @@ time_clock(PyObject *self, PyObject *args)
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
#define HAVE_CLOCK /* So it gets included in the methods */
 | 
			
		||||
#endif /* MS_WINDOWS && !MS_WIN64 */
 | 
			
		||||
#endif /* MS_WINDOWS && !defined(__BORLANDC__) */
 | 
			
		||||
 | 
			
		||||
#ifdef HAVE_CLOCK
 | 
			
		||||
PyDoc_STRVAR(clock_doc,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue