mirror of https://git.ffmpeg.org/ffmpeg.git
fix compilation after michaels anti-time change
Originally committed as revision 2977 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e9afa2f4dd
commit
00a3c8b8a9
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue