From 9ce281873cd0176a2952acffbd3af9014cd06809 Mon Sep 17 00:00:00 2001 From: Paulo Matias Date: Sun, 18 Aug 2013 15:47:46 -0300 Subject: [PATCH] Remove ffi.cdef to avoid conflict with ffi/util.lua from koreader-base --- frontend/lulip.lua | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/frontend/lulip.lua b/frontend/lulip.lua index aee1c65a5..f4d41360a 100644 --- a/frontend/lulip.lua +++ b/frontend/lulip.lua @@ -18,21 +18,11 @@ local string_sub = string.sub local string_gsub = string.gsub local string_format = string.format local ffi = require("ffi") - -ffi.cdef[[ - typedef long time_t; - - typedef struct timeval { - time_t tv_sec; - time_t tv_usec; - } timeval; - - int gettimeofday(struct timeval* t, void* tzp); -]] +local util = require("ffi/util") -- ffi.C.gettimeofday module(...) -local gettimeofday_struct = ffi.new("timeval") +local gettimeofday_struct = ffi.new("struct timeval") local function gettimeofday() ffi.C.gettimeofday(gettimeofday_struct, nil) return tonumber(gettimeofday_struct.tv_sec) * 1000000 + tonumber(gettimeofday_struct.tv_usec)