Commit 2a86d50b authored by Sascha Sommer's avatar Sascha Sommer Committed by Michael Niedermayer

cygwin patch by ("Sascha Sommer" <saschasommer at freenet dot de>)

Originally committed as revision 3053 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent aacc6615
...@@ -210,7 +210,7 @@ static inline float floorf(float f) { ...@@ -210,7 +210,7 @@ static inline float floorf(float f) {
# include <assert.h> # include <assert.h>
/* dprintf macros */ /* dprintf macros */
# if defined(CONFIG_WIN32) && !defined(__MINGW32__) # if defined(CONFIG_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
inline void dprintf(const char* fmt,...) {} inline void dprintf(const char* fmt,...) {}
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
int64_t av_gettime(void) int64_t av_gettime(void)
{ {
#ifdef CONFIG_WIN32 #ifdef CONFIG_WIN32
struct _timeb tb; struct timeb tb;
_ftime(&tb); _ftime(&tb);
return ((int64_t)tb.time * int64_t_C(1000) + (int64_t)tb.millitm) * int64_t_C(1000); return ((int64_t)tb.time * int64_t_C(1000) + (int64_t)tb.millitm) * int64_t_C(1000);
#else #else
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
*/ */
#ifdef __MINGW32__ #ifdef __MINGW32__
# undef DATADIR /* clashes with /usr/include/w32api/objidl.h */
__declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds); __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
// # include <windows.h> // # include <windows.h>
# define usleep(t) Sleep((t) / 1000) # define usleep(t) Sleep((t) / 1000)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment