cygwin patch by ("Sascha Sommer" <saschasommer at freenet dot de>)
Originally committed as revision 3053 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									aacc6615f8
								
							
						
					
					
						commit
						2a86d50bd9
					
				@ -210,7 +210,7 @@ static inline float floorf(float f) {
 | 
			
		||||
#    include <assert.h>
 | 
			
		||||
 | 
			
		||||
/* dprintf macros */
 | 
			
		||||
#    if defined(CONFIG_WIN32) && !defined(__MINGW32__)
 | 
			
		||||
#    if defined(CONFIG_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 | 
			
		||||
 | 
			
		||||
inline void dprintf(const char* fmt,...) {}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -34,7 +34,7 @@
 | 
			
		||||
int64_t av_gettime(void)
 | 
			
		||||
{
 | 
			
		||||
#ifdef CONFIG_WIN32
 | 
			
		||||
    struct _timeb tb;
 | 
			
		||||
    struct timeb tb;
 | 
			
		||||
    _ftime(&tb);
 | 
			
		||||
    return ((int64_t)tb.time * int64_t_C(1000) + (int64_t)tb.millitm) * int64_t_C(1000);
 | 
			
		||||
#else
 | 
			
		||||
 | 
			
		||||
@ -11,7 +11,6 @@
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifdef __MINGW32__
 | 
			
		||||
#  undef DATADIR /* clashes with /usr/include/w32api/objidl.h */
 | 
			
		||||
__declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
 | 
			
		||||
// #  include <windows.h>
 | 
			
		||||
#  define usleep(t)    Sleep((t) / 1000)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user