Merge branch 'master' into hjelmeland-patch-1hjelmeland-patch-1

1 files changed, 15 insertions, 7 deletions

diff --git a/src/timeout.c b/src/timeout.c
index 087d033..2bdc069 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -2,17 +2,15 @@
 * Timeout management functions
 * LuaSocket toolkit
 \*=========================================================================*/
-#include <stdio.h>
-#include <limits.h>
-#include <float.h>
-
-#include "lua.h"
-#include "lauxlib.h"
-#include "compat.h"
+#include "luasocket.h"
 
 #include "auxiliar.h"
 #include "timeout.h"
 
+#include <stdio.h>
+#include <limits.h>
+#include <float.h>
+
 #ifdef _WIN32
 #include <windows.h>
 #else
@@ -173,6 +171,16 @@ int timeout_meth_settimeout(lua_State *L, p_timeout tm) {
     return 1;
 }
 
+/*-------------------------------------------------------------------------*\
+* Gets timeout values for IO operations
+* Lua Output: block, total
+\*-------------------------------------------------------------------------*/
+int timeout_meth_gettimeout(lua_State *L, p_timeout tm) {
+    lua_pushnumber(L, tm->block);
+    lua_pushnumber(L, tm->total);
+    return 2;
+}
+
 /*=========================================================================*\
 * Test support functions
 \*=========================================================================*/