Browse Source

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

Originally committed as revision 3053 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Sascha Sommer Michael Niedermayer 21 years ago
parent
commit
2a86d50bd9
3 changed files with 2 additions and 3 deletions
  1. +1
    -1
      libavcodec/common.h
  2. +1
    -1
      libavformat/os_support.c
  3. +0
    -1
      libavformat/os_support.h

+ 1
- 1
libavcodec/common.h View File

@@ -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,...) {}




+ 1
- 1
libavformat/os_support.c View File

@@ -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


+ 0
- 1
libavformat/os_support.h View File

@@ -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)


Loading…
Cancel
Save