Commit 57c5da37 authored by alex's avatar alex

fix compilation after michaels anti-time change


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2977 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 69b63037
...@@ -43,17 +43,18 @@ ...@@ -43,17 +43,18 @@
#define MAXSIZE_TEXT 1024 #define MAXSIZE_TEXT 1024
#include "framehook.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#undef time
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#include "framehook.h"
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include FT_GLYPH_H #include FT_GLYPH_H
......
...@@ -42,18 +42,21 @@ ...@@ -42,18 +42,21 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "framehook.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#undef time
#include <sys/time.h> #include <sys/time.h>
#include <time.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <Imlib2.h> #include <Imlib2.h>
#include "framehook.h"
typedef struct { typedef struct {
int dummy; int dummy;
Imlib_Font fn; Imlib_Font fn;
......
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