[lmi-commits] [6481] Don't use two-element mkdir() with msw (VZ)

[Greg Chicares]

Revision: 6481
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6481
Author:   chicares
Date:     2016-01-20 19:13:51 +0000 (Wed, 20 Jan 2016)
Log Message:
-----------
Don't use two-element mkdir() with msw (VZ)

Modified Paths:
--------------
    lmi/trunk/libxslt-1.1.17-lmi.patch
    lmi/trunk/test_coding_rules.cpp

Modified: lmi/trunk/libxslt-1.1.17-lmi.patch
===================================================================
--- lmi/trunk/libxslt-1.1.17-lmi.patch  2016-01-20 11:35:38 UTC (rev 6480)
+++ lmi/trunk/libxslt-1.1.17-lmi.patch  2016-01-20 19:13:51 UTC (rev 6481)
@@ -65,3 +65,28 @@
  } xsltStyleType;
  
  /**
+diff --recursive --unified=3 original/libxslt-1.1.17/libxslt/libxslt.h 
modified/libxslt-1.1.17/libxslt/libxslt.h
+--- original/libxslt-1.1.17/libxslt/libxslt.h  2016-01-08 15:14:02.210375000 
+0100
++++ modified/libxslt-1.1.17/libxslt/libxslt.h  2016-01-08 15:15:05.929125000 
+0100
+@@ -27,4 +27,10 @@
+ #endif
+ #endif
+ 
++#if defined(_MSC_VER) || defined(__MINGW32__)
++#include <io.h>
++#include <direct.h>
++#define mkdir(p,m) _mkdir(p)
++#endif
++
+ #endif /* ! __XSLT_LIBXSLT_H__ */
+diff --recursive --unified=3 original/libxslt-1.1.17/libxslt/win32config.h 
modified/libxslt-1.1.17/libxslt/win32config.h
+--- original/libxslt-1.1.17/libxslt/win32config.h      2016-01-08 
15:14:02.210375000 +0100
++++ modified/libxslt-1.1.17/libxslt/win32config.h      2016-01-08 
15:15:05.929125000 +0100
+@@ -78,7 +78,6 @@
+ 
+ #include <direct.h>
+ #if defined(_MSC_VER) || defined(__MINGW32__)
+-#define mkdir(p,m) _mkdir(p)
+ #define snprintf _snprintf
+ #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+ #endif

Modified: lmi/trunk/test_coding_rules.cpp
===================================================================
--- lmi/trunk/test_coding_rules.cpp     2016-01-20 11:35:38 UTC (rev 6480)
+++ lmi/trunk/test_coding_rules.cpp     2016-01-20 19:13:51 UTC (rev 6481)
@@ -869,6 +869,7 @@
         ,"D__WXDEBUG__" // Hapax legomenon.
         ,"__WXGTK__"
         ,"__WXMSW__"
+        ,"__XSLT_LIBXSLT_H__"
         ,"__mp_copymem"
         };
     static int const n = lmi_array_size(y);