summaryrefslogtreecommitdiff
path: root/vhook/imlib2.c
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2004-04-07 13:31:27 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2004-04-07 13:31:27 +0000
commit00a3c8b8a9a487727dd4e5f82d4095330863107e (patch)
treeffe394338743f102195c2f07b3cb8100ba3e38bf /vhook/imlib2.c
parente9afa2f4dd9a1340c1538a580720864e90c83e3b (diff)
fix compilation after michaels anti-time change
Originally committed as revision 2977 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'vhook/imlib2.c')
-rw-r--r--vhook/imlib2.c7
1 files changed, 5 insertions, 2 deletions
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;