fix compilation after michaels anti-time change
authorAlex Beregszaszi <alex@rtfs.hu>
Wed, 7 Apr 2004 13:31:27 +0000 (13:31 +0000)
committerAlex Beregszaszi <alex@rtfs.hu>
Wed, 7 Apr 2004 13:31:27 +0000 (13:31 +0000)
Originally committed as revision 2977 to svn://svn.ffmpeg.org/ffmpeg/trunk

vhook/drawtext.c
vhook/imlib2.c

index df87198..4325413 100644 (file)
 
 #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
index d569c80..4e890e1 100644 (file)
  * 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;