diff options
| author | Sascha Sommer <saschasommer@freenet.de> | 2003-04-10 18:02:17 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-04-10 18:02:17 +0000 |
| commit | b5e34cb1c1d7ef260731c916e79ce19cf4792a6e (patch) | |
| tree | 7dbdac549b3b55e6ec33d665efef2f0aa717681c | |
| parent | ba57a3ff23cd295c3b225db3ba0d995602bf54de (diff) | |
#undef DATADIR before inclusion of windows.h patch by ("Sascha Sommer" <saschasommer at freenet dot de>)
Originally committed as revision 1749 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/os_support.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/os_support.h b/libavcodec/os_support.h index 879bc470dd..c3b3482b69 100644 --- a/libavcodec/os_support.h +++ b/libavcodec/os_support.h @@ -11,6 +11,7 @@ */ #ifdef __MINGW32__ +# undef DATADIR /* clashes with /usr/include/w32api/objidl.h */ # include <windows.h> # define usleep(t) Sleep((t) / 1000) #endif |