Merge branch 'master' into 1.7

2 files changed, 14 insertions, 12 deletions

diff --git a/src/lfs.c b/src/lfs.c
index 0387e15..dd0b6af 100644
--- a/src/lfs.c
+++ b/src/lfs.c
@@ -875,7 +875,7 @@ static const struct luaL_Reg fslib[] = {
         {NULL, NULL},
 };
 
-int luaopen_lfs (lua_State *L) {
+LFS_EXPORT int luaopen_lfs (lua_State *L) {
         dir_create_meta (L);
         lock_create_meta (L);
         luaL_newlib (L, fslib);
diff --git a/src/lfs.h b/src/lfs.h
index a621d04..7f7d2ab 100644
--- a/src/lfs.h
+++ b/src/lfs.h
@@ -5,27 +5,29 @@
 
 /* Define 'chdir' for systems that do not implement it */
 #ifdef NO_CHDIR
-#define chdir(p)        (-1)
-#define chdir_error     "Function 'chdir' not provided by system"
+  #define chdir(p)      (-1)
+  #define chdir_error   "Function 'chdir' not provided by system"
 #else
-#define chdir_error     strerror(errno)
-
+  #define chdir_error   strerror(errno)
 #endif
 
 #ifdef _WIN32
-#define chdir(p) (_chdir(p))
-#define getcwd(d, s) (_getcwd(d, s))
-#define rmdir(p) (_rmdir(p))
-#ifndef fileno
-#define fileno(f) (_fileno(f))
-#endif
+  #define chdir(p) (_chdir(p))
+  #define getcwd(d, s) (_getcwd(d, s))
+  #define rmdir(p) (_rmdir(p))
+  #define LFS_EXPORT __declspec (dllexport)
+  #ifndef fileno
+    #define fileno(f) (_fileno(f))
+  #endif
+#else
+  #define LFS_EXPORT
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int luaopen_lfs (lua_State *L);
+LFS_EXPORT  int luaopen_lfs (lua_State *L);
 
 #ifdef __cplusplus
 }