diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2004-04-07 13:31:27 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2004-04-07 13:31:27 +0000 |
| commit | 00a3c8b8a9a487727dd4e5f82d4095330863107e (patch) | |
| tree | ffe394338743f102195c2f07b3cb8100ba3e38bf /vhook | |
| parent | e9afa2f4dd9a1340c1538a580720864e90c83e3b (diff) | |
| download | ffmpeg-00a3c8b8a9a487727dd4e5f82d4095330863107e.tar.gz | |
fix compilation after michaels anti-time change
Originally committed as revision 2977 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'vhook')
| -rw-r--r-- | vhook/drawtext.c | 5 | ||||
| -rw-r--r-- | vhook/imlib2.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/vhook/drawtext.c b/vhook/drawtext.c index df87198757..432541342b 100644 --- a/vhook/drawtext.c +++ b/vhook/drawtext.c @@ -43,17 +43,18 @@ #define MAXSIZE_TEXT 1024 +#include "framehook.h" + #include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <stdarg.h> #include <string.h> #include <unistd.h> +#undef time #include <sys/time.h> #include <time.h> -#include "framehook.h" - #include <ft2build.h> #include FT_FREETYPE_H #include FT_GLYPH_H diff --git a/vhook/imlib2.c b/vhook/imlib2.c index d569c808d6..4e890e14e7 100644 --- a/vhook/imlib2.c +++ b/vhook/imlib2.c @@ -42,18 +42,21 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "framehook.h" + #include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <stdarg.h> #include <string.h> #include <unistd.h> +#undef time #include <sys/time.h> +#include <time.h> #include <X11/Xlib.h> #include <Imlib2.h> -#include "framehook.h" - typedef struct { int dummy; Imlib_Font fn; |