Mercurial > code

diff modules/fs/fs.cpp @ 555:730358cb0648

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fs: style and do not define _CRT_SECURE_NO_WARNINGS if already defined
author David Demelier <markand@malikania.fr>
date Thu, 16 Jun 2016 12:44:24 +0200
parents ecf5fb9319da
children 67da1bacd884
line wrap: on
line diff
--- a/modules/fs/fs.cpp	Wed Jun 15 13:46:59 2016 +0200
+++ b/modules/fs/fs.cpp	Thu Jun 16 12:44:24 2016 +0200
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if defined(_WIN32)
-#  define _CRT_SECURE_NO_WARNINGS
+#if defined(_WIN32) && !defined(_CRT_SECURE_NO_WARNINGS)
+#   define _CRT_SECURE_NO_WARNINGS
 #endif
 
 #include <algorithm>
@@ -29,13 +29,13 @@
 #include <stdexcept>
 
 #if defined(_WIN32)
-#  include <direct.h>
-#  include <Windows.h>
-#  include <Shlwapi.h>
+#   include <direct.h>
+#   include <Windows.h>
+#   include <Shlwapi.h>
 #else
-#  include <sys/types.h>
-#  include <dirent.h>
-#  include <unistd.h>
+#   include <sys/types.h>
+#   include <dirent.h>
+#   include <unistd.h>
 #endif
 
 #include "fs.hpp"