Merge pull request #271 from ewestbrook/pragmavisibility

Use visibility pragma around declarations instead of attributes on definitions

1 files changed, 12 insertions, 16 deletions

diff --git a/src/timeout.c b/src/timeout.c
index 8fb8f55..2bdc069 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -4,10 +4,6 @@
 \*=========================================================================*/
 #include "luasocket.h"
 
-#include "lua.h"
-#include "lauxlib.h"
-#include "compat.h"
-
 #include "auxiliar.h"
 #include "timeout.h"
 
@@ -48,7 +44,7 @@ static luaL_Reg func[] = {
 /*-------------------------------------------------------------------------*\
 * Initialize structure
 \*-------------------------------------------------------------------------*/
-LUASOCKET_PRIVATE void timeout_init(p_timeout tm, double block, double total) {
+void timeout_init(p_timeout tm, double block, double total) {
     tm->block = block;
     tm->total = total;
 }
@@ -61,7 +57,7 @@ LUASOCKET_PRIVATE void timeout_init(p_timeout tm, double block, double total) {
 * Returns
 *   the number of ms left or -1 if there is no time limit
 \*-------------------------------------------------------------------------*/
-LUASOCKET_PRIVATE double timeout_get(p_timeout tm) {
+double timeout_get(p_timeout tm) {
     if (tm->block < 0.0 && tm->total < 0.0) {
         return -1;
     } else if (tm->block < 0.0) {
@@ -82,7 +78,7 @@ LUASOCKET_PRIVATE double timeout_get(p_timeout tm) {
 * Returns
 *   start field of structure
 \*-------------------------------------------------------------------------*/
-LUASOCKET_PRIVATE double timeout_getstart(p_timeout tm) {
+double timeout_getstart(p_timeout tm) {
     return tm->start;
 }
 
@@ -94,7 +90,7 @@ LUASOCKET_PRIVATE double timeout_getstart(p_timeout tm) {
 * Returns
 *   the number of ms left or -1 if there is no time limit
 \*-------------------------------------------------------------------------*/
-LUASOCKET_PRIVATE double timeout_getretry(p_timeout tm) {
+double timeout_getretry(p_timeout tm) {
     if (tm->block < 0.0 && tm->total < 0.0) {
         return -1;
     } else if (tm->block < 0.0) {
@@ -114,7 +110,7 @@ LUASOCKET_PRIVATE double timeout_getretry(p_timeout tm) {
 * Input
 *   tm: timeout control structure
 \*-------------------------------------------------------------------------*/
-LUASOCKET_PRIVATE p_timeout timeout_markstart(p_timeout tm) {
+p_timeout timeout_markstart(p_timeout tm) {
     tm->start = timeout_gettime();
     return tm;
 }
@@ -125,7 +121,7 @@ LUASOCKET_PRIVATE p_timeout timeout_markstart(p_timeout tm) {
 *   time in s.
 \*-------------------------------------------------------------------------*/
 #ifdef _WIN32
-LUASOCKET_PRIVATE double timeout_gettime(void) {
+double timeout_gettime(void) {
     FILETIME ft;
     double t;
     GetSystemTimeAsFileTime(&ft);
@@ -135,7 +131,7 @@ LUASOCKET_PRIVATE double timeout_gettime(void) {
     return (t - 11644473600.0);
 }
 #else
-LUASOCKET_PRIVATE double timeout_gettime(void) {
+double timeout_gettime(void) {
     struct timeval v;
     gettimeofday(&v, (struct timezone *) NULL);
     /* Unix Epoch time (time since January 1, 1970 (UTC)) */
@@ -146,7 +142,7 @@ LUASOCKET_PRIVATE double timeout_gettime(void) {
 /*-------------------------------------------------------------------------*\
 * Initializes module
 \*-------------------------------------------------------------------------*/
-LUASOCKET_PRIVATE int timeout_open(lua_State *L) {
+int timeout_open(lua_State *L) {
     luaL_setfuncs(L, func, 0);
     return 0;
 }
@@ -157,7 +153,7 @@ LUASOCKET_PRIVATE int timeout_open(lua_State *L) {
 *   time: time out value in seconds
 *   mode: "b" for block timeout, "t" for total timeout. (default: b)
 \*-------------------------------------------------------------------------*/
-LUASOCKET_PRIVATE int timeout_meth_settimeout(lua_State *L, p_timeout tm) {
+int timeout_meth_settimeout(lua_State *L, p_timeout tm) {
     double t = luaL_optnumber(L, 2, -1);
     const char *mode = luaL_optstring(L, 3, "b");
     switch (*mode) {
@@ -179,7 +175,7 @@ LUASOCKET_PRIVATE int timeout_meth_settimeout(lua_State *L, p_timeout tm) {
 * Gets timeout values for IO operations
 * Lua Output: block, total
 \*-------------------------------------------------------------------------*/
-LUASOCKET_PRIVATE int timeout_meth_gettimeout(lua_State *L, p_timeout tm) {
+int timeout_meth_gettimeout(lua_State *L, p_timeout tm) {
     lua_pushnumber(L, tm->block);
     lua_pushnumber(L, tm->total);
     return 2;
@@ -201,7 +197,7 @@ static int timeout_lua_gettime(lua_State *L)
 * Sleep for n seconds.
 \*-------------------------------------------------------------------------*/
 #ifdef _WIN32
-LUASOCKET_PRIVATE int timeout_lua_sleep(lua_State *L)
+int timeout_lua_sleep(lua_State *L)
 {
     double n = luaL_checknumber(L, 1);
     if (n < 0.0) n = 0.0;
@@ -211,7 +207,7 @@ LUASOCKET_PRIVATE int timeout_lua_sleep(lua_State *L)
     return 0;
 }
 #else
-LUASOCKET_PRIVATE int timeout_lua_sleep(lua_State *L)
+int timeout_lua_sleep(lua_State *L)
 {
     double n = luaL_checknumber(L, 1);
     struct timespec t, r;