Mercurial > code

changeset 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 20fcf96038ae
children 6872b3c443c7
files modules/fs/fs.cpp modules/fs/fs.hpp
diffstat 2 files changed, 31 insertions(+), 31 deletions(-) [+]
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"
--- a/modules/fs/fs.hpp	Wed Jun 15 13:46:59 2016 +0200
+++ b/modules/fs/fs.hpp	Thu Jun 16 12:44:24 2016 +0200
@@ -45,31 +45,31 @@
  */
 
 #if !defined(FS_HAVE_STAT)
-#  if defined(_WIN32)
-#    define FS_HAVE_STAT
-#  elif defined(__linux__)
-#    define FS_HAVE_STAT
-#  elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-#    define FS_HAVE_STAT
-#  elif defined(__APPLE__)
-#    define FS_HAVE_STAT
-#  endif
+#   if defined(_WIN32)
+#       define FS_HAVE_STAT
+#   elif defined(__linux__)
+#       define FS_HAVE_STAT
+#   elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#       define FS_HAVE_STAT
+#   elif defined(__APPLE__)
+#       define FS_HAVE_STAT
+#   endif
 #endif
 
 #if !defined(FS_EXPORT)
-#  if defined(FS_DLL)
-#    if defined(_WIN32)
-#      if defined(FS_BUILDING_DLL)
-#        define FS_EXPORT __declspec(dllexport)
-#      else
-#        define FS_EXPORT __declspec(dllimport)
-#      endif
-#    else
-#      define FS_EXPORT
-#    endif
-#  else
-#    define FS_EXPORT
-#  endif
+#   if defined(FS_DLL)
+#       if defined(_WIN32)
+#           if defined(FS_BUILDING_DLL)
+#               define FS_EXPORT __declspec(dllexport)
+#           else
+#               define FS_EXPORT __declspec(dllimport)
+#           endif
+#       else
+#           define FS_EXPORT
+#       endif
+#   else
+#       define FS_EXPORT
+#   endif
 #endif
 
 /**
@@ -77,7 +77,7 @@
  */
 
 #if defined(FS_HAVE_STAT)
-#  include <sys/stat.h>
+#   include <sys/stat.h>
 #endif
 
 #include <regex>